diff options
| author | 2021-10-16 02:07:18 -0400 | |
|---|---|---|
| committer | 2021-10-17 00:37:49 -0400 | |
| commit | ef811c64259f0b83aa72c99bad9d4e48082129f8 (patch) | |
| tree | 68a10f30c76c06fe2cbd7893d6481e7372e57613 /src/core | |
| parent | Merge pull request #7190 from Morph1984/missing-ui-main (diff) | |
| download | yuzu-ef811c64259f0b83aa72c99bad9d4e48082129f8.tar.gz yuzu-ef811c64259f0b83aa72c99bad9d4e48082129f8.tar.xz yuzu-ef811c64259f0b83aa72c99bad9d4e48082129f8.zip | |
settings: Remove std::chrono usage
Alleviates the dependency on chrono for all files that include settings.h
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/time/time_manager.cpp | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 3042d611b..3c75f42ae 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -196,8 +196,9 @@ struct System::Impl { | |||
| 196 | cpu_manager.Initialize(); | 196 | cpu_manager.Initialize(); |
| 197 | core_timing.Initialize([&system]() { system.RegisterHostThread(); }); | 197 | core_timing.Initialize([&system]() { system.RegisterHostThread(); }); |
| 198 | 198 | ||
| 199 | const auto current_time = std::chrono::duration_cast<std::chrono::seconds>( | 199 | const auto posix_time = std::chrono::system_clock::now().time_since_epoch(); |
| 200 | std::chrono::system_clock::now().time_since_epoch()); | 200 | const auto current_time = |
| 201 | std::chrono::duration_cast<std::chrono::seconds>(posix_time).count(); | ||
| 201 | Settings::values.custom_rtc_differential = | 202 | Settings::values.custom_rtc_differential = |
| 202 | Settings::values.custom_rtc.value_or(current_time) - current_time; | 203 | Settings::values.custom_rtc.value_or(current_time) - current_time; |
| 203 | 204 | ||
diff --git a/src/core/hle/service/time/time_manager.cpp b/src/core/hle/service/time/time_manager.cpp index 4bbc606a1..9c4c960ef 100644 --- a/src/core/hle/service/time/time_manager.cpp +++ b/src/core/hle/service/time/time_manager.cpp | |||
| @@ -13,18 +13,19 @@ | |||
| 13 | #include "core/hle/service/time/time_manager.h" | 13 | #include "core/hle/service/time/time_manager.h" |
| 14 | 14 | ||
| 15 | namespace Service::Time { | 15 | namespace Service::Time { |
| 16 | 16 | namespace { | |
| 17 | constexpr Clock::TimeSpanType standard_network_clock_accuracy{0x0009356907420000ULL}; | 17 | constexpr Clock::TimeSpanType standard_network_clock_accuracy{0x0009356907420000ULL}; |
| 18 | 18 | ||
| 19 | static std::chrono::seconds GetSecondsSinceEpoch() { | 19 | s64 GetSecondsSinceEpoch() { |
| 20 | return std::chrono::duration_cast<std::chrono::seconds>( | 20 | const auto time_since_epoch = std::chrono::system_clock::now().time_since_epoch(); |
| 21 | std::chrono::system_clock::now().time_since_epoch()) + | 21 | return std::chrono::duration_cast<std::chrono::seconds>(time_since_epoch).count() + |
| 22 | Settings::values.custom_rtc_differential; | 22 | Settings::values.custom_rtc_differential; |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | static s64 GetExternalRtcValue() { | 25 | s64 GetExternalRtcValue() { |
| 26 | return GetSecondsSinceEpoch().count() + TimeManager::GetExternalTimeZoneOffset(); | 26 | return GetSecondsSinceEpoch() + TimeManager::GetExternalTimeZoneOffset(); |
| 27 | } | 27 | } |
| 28 | } // Anonymous namespace | ||
| 28 | 29 | ||
| 29 | struct TimeManager::Impl final { | 30 | struct TimeManager::Impl final { |
| 30 | explicit Impl(Core::System& system) | 31 | explicit Impl(Core::System& system) |