diff options
| author | 2020-04-17 21:04:43 -0400 | |
|---|---|---|
| committer | 2020-04-17 21:04:43 -0400 | |
| commit | 907ba8794eb40796bd384790f15115c28ef78baf (patch) | |
| tree | e0669c3688f89310cd35f2337357344ceaf63473 /src | |
| parent | Merge pull request #3711 from lioncash/cast (diff) | |
| parent | time/system_clock_core: Remove unnecessary initializer (diff) | |
| download | yuzu-907ba8794eb40796bd384790f15115c28ef78baf.tar.gz yuzu-907ba8794eb40796bd384790f15115c28ef78baf.tar.xz yuzu-907ba8794eb40796bd384790f15115c28ef78baf.zip | |
Merge pull request #3713 from lioncash/time
service/time: Minor changes
Diffstat (limited to 'src')
5 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/service/time/standard_network_system_clock_core.h b/src/core/hle/service/time/standard_network_system_clock_core.h index 3f505c37c..c993bdf79 100644 --- a/src/core/hle/service/time/standard_network_system_clock_core.h +++ b/src/core/hle/service/time/standard_network_system_clock_core.h | |||
| @@ -23,7 +23,7 @@ public: | |||
| 23 | standard_network_clock_sufficient_accuracy = value; | 23 | standard_network_clock_sufficient_accuracy = value; |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | bool IsStandardNetworkSystemClockAccuracySufficient(Core::System& system) { | 26 | bool IsStandardNetworkSystemClockAccuracySufficient(Core::System& system) const { |
| 27 | SystemClockContext context{}; | 27 | SystemClockContext context{}; |
| 28 | if (GetClockContext(system, context) != RESULT_SUCCESS) { | 28 | if (GetClockContext(system, context) != RESULT_SUCCESS) { |
| 29 | return {}; | 29 | return {}; |
diff --git a/src/core/hle/service/time/steady_clock_core.h b/src/core/hle/service/time/steady_clock_core.h index 84af3d105..d80a2385f 100644 --- a/src/core/hle/service/time/steady_clock_core.h +++ b/src/core/hle/service/time/steady_clock_core.h | |||
| @@ -16,6 +16,7 @@ namespace Service::Time::Clock { | |||
| 16 | class SteadyClockCore { | 16 | class SteadyClockCore { |
| 17 | public: | 17 | public: |
| 18 | SteadyClockCore() = default; | 18 | SteadyClockCore() = default; |
| 19 | virtual ~SteadyClockCore() = default; | ||
| 19 | 20 | ||
| 20 | const Common::UUID& GetClockSourceId() const { | 21 | const Common::UUID& GetClockSourceId() const { |
| 21 | return clock_source_id; | 22 | return clock_source_id; |
diff --git a/src/core/hle/service/time/system_clock_context_update_callback.h b/src/core/hle/service/time/system_clock_context_update_callback.h index 6260de6c3..2b0fa7e75 100644 --- a/src/core/hle/service/time/system_clock_context_update_callback.h +++ b/src/core/hle/service/time/system_clock_context_update_callback.h | |||
| @@ -20,7 +20,7 @@ namespace Service::Time::Clock { | |||
| 20 | class SystemClockContextUpdateCallback { | 20 | class SystemClockContextUpdateCallback { |
| 21 | public: | 21 | public: |
| 22 | SystemClockContextUpdateCallback(); | 22 | SystemClockContextUpdateCallback(); |
| 23 | ~SystemClockContextUpdateCallback(); | 23 | virtual ~SystemClockContextUpdateCallback(); |
| 24 | 24 | ||
| 25 | bool NeedUpdate(const SystemClockContext& value) const; | 25 | bool NeedUpdate(const SystemClockContext& value) const; |
| 26 | 26 | ||
diff --git a/src/core/hle/service/time/system_clock_core.cpp b/src/core/hle/service/time/system_clock_core.cpp index 1a3ab8cfa..d31d4e2ca 100644 --- a/src/core/hle/service/time/system_clock_core.cpp +++ b/src/core/hle/service/time/system_clock_core.cpp | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | namespace Service::Time::Clock { | 9 | namespace Service::Time::Clock { |
| 10 | 10 | ||
| 11 | SystemClockCore::SystemClockCore(SteadyClockCore& steady_clock_core) | 11 | SystemClockCore::SystemClockCore(SteadyClockCore& steady_clock_core) |
| 12 | : steady_clock_core{steady_clock_core}, is_initialized{} { | 12 | : steady_clock_core{steady_clock_core} { |
| 13 | context.steady_time_point.clock_source_id = steady_clock_core.GetClockSourceId(); | 13 | context.steady_time_point.clock_source_id = steady_clock_core.GetClockSourceId(); |
| 14 | } | 14 | } |
| 15 | 15 | ||
diff --git a/src/core/hle/service/time/system_clock_core.h b/src/core/hle/service/time/system_clock_core.h index 54407a6c5..608dd3b2e 100644 --- a/src/core/hle/service/time/system_clock_core.h +++ b/src/core/hle/service/time/system_clock_core.h | |||
| @@ -22,7 +22,7 @@ class SystemClockContextUpdateCallback; | |||
| 22 | class SystemClockCore { | 22 | class SystemClockCore { |
| 23 | public: | 23 | public: |
| 24 | explicit SystemClockCore(SteadyClockCore& steady_clock_core); | 24 | explicit SystemClockCore(SteadyClockCore& steady_clock_core); |
| 25 | ~SystemClockCore(); | 25 | virtual ~SystemClockCore(); |
| 26 | 26 | ||
| 27 | SteadyClockCore& GetSteadyClockCore() const { | 27 | SteadyClockCore& GetSteadyClockCore() const { |
| 28 | return steady_clock_core; | 28 | return steady_clock_core; |