diff options
| author | 2018-12-28 20:24:24 -0500 | |
|---|---|---|
| committer | 2019-01-07 19:19:40 -0500 | |
| commit | 05dbb47af51fb00826912155da85469cb74022db (patch) | |
| tree | 3162febaeb374ee6310491f75d94b2ec4918b5ae /src/core/hle | |
| parent | time: Use custom RTC settings if applicable for game (diff) | |
| download | yuzu-05dbb47af51fb00826912155da85469cb74022db.tar.gz yuzu-05dbb47af51fb00826912155da85469cb74022db.tar.xz yuzu-05dbb47af51fb00826912155da85469cb74022db.zip | |
settings: Use std::chrono::seconds instead of s64 for RTC
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index ef8c9f2b7..c13640ad8 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp | |||
| @@ -16,10 +16,9 @@ | |||
| 16 | 16 | ||
| 17 | namespace Service::Time { | 17 | namespace Service::Time { |
| 18 | 18 | ||
| 19 | static s64 GetSecondsSinceEpoch() { | 19 | static std::chrono::seconds GetSecondsSinceEpoch() { |
| 20 | return std::chrono::duration_cast<std::chrono::seconds>( | 20 | return std::chrono::duration_cast<std::chrono::seconds>( |
| 21 | std::chrono::system_clock::now().time_since_epoch()) | 21 | std::chrono::system_clock::now().time_since_epoch()) + |
| 22 | .count() + | ||
| 23 | Settings::values.custom_rtc_differential; | 22 | Settings::values.custom_rtc_differential; |
| 24 | } | 23 | } |
| 25 | 24 | ||
| @@ -76,7 +75,7 @@ public: | |||
| 76 | 75 | ||
| 77 | private: | 76 | private: |
| 78 | void GetCurrentTime(Kernel::HLERequestContext& ctx) { | 77 | void GetCurrentTime(Kernel::HLERequestContext& ctx) { |
| 79 | const s64 time_since_epoch{GetSecondsSinceEpoch()}; | 78 | const s64 time_since_epoch{GetSecondsSinceEpoch().count()}; |
| 80 | LOG_DEBUG(Service_Time, "called"); | 79 | LOG_DEBUG(Service_Time, "called"); |
| 81 | 80 | ||
| 82 | IPC::ResponseBuilder rb{ctx, 4}; | 81 | IPC::ResponseBuilder rb{ctx, 4}; |
| @@ -272,8 +271,7 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { | |||
| 272 | IPC::RequestParser rp{ctx}; | 271 | IPC::RequestParser rp{ctx}; |
| 273 | const auto initial_type = rp.PopRaw<u8>(); | 272 | const auto initial_type = rp.PopRaw<u8>(); |
| 274 | 273 | ||
| 275 | const s64 time_since_epoch{GetSecondsSinceEpoch()}; | 274 | const s64 time_since_epoch{GetSecondsSinceEpoch().count()}; |
| 276 | |||
| 277 | const std::time_t time(time_since_epoch); | 275 | const std::time_t time(time_since_epoch); |
| 278 | const std::tm* tm = std::localtime(&time); | 276 | const std::tm* tm = std::localtime(&time); |
| 279 | if (tm == nullptr) { | 277 | if (tm == nullptr) { |