summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-12 19:26:37 -0500
committerGravatar GitHub2019-02-12 19:26:37 -0500
commit8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch)
tree83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/hle/kernel/kernel.cpp
parentMerge pull request #2104 from ReinUsesLisp/compute-assert (diff)
parentcore_timing: Rename CoreTiming namespace to Core::Timing (diff)
downloadyuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 7a524ce5a..3721ae8fe 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -124,7 +124,7 @@ struct KernelCore::Impl {
124 124
125 void InitializeThreads() { 125 void InitializeThreads() {
126 thread_wakeup_event_type = 126 thread_wakeup_event_type =
127 CoreTiming::RegisterEvent("ThreadWakeupCallback", ThreadWakeupCallback); 127 Core::Timing::RegisterEvent("ThreadWakeupCallback", ThreadWakeupCallback);
128 } 128 }
129 129
130 std::atomic<u32> next_object_id{0}; 130 std::atomic<u32> next_object_id{0};
@@ -137,7 +137,7 @@ struct KernelCore::Impl {
137 137
138 SharedPtr<ResourceLimit> system_resource_limit; 138 SharedPtr<ResourceLimit> system_resource_limit;
139 139
140 CoreTiming::EventType* thread_wakeup_event_type = nullptr; 140 Core::Timing::EventType* thread_wakeup_event_type = nullptr;
141 // TODO(yuriks): This can be removed if Thread objects are explicitly pooled in the future, 141 // TODO(yuriks): This can be removed if Thread objects are explicitly pooled in the future,
142 // allowing us to simply use a pool index or similar. 142 // allowing us to simply use a pool index or similar.
143 Kernel::HandleTable thread_wakeup_callback_handle_table; 143 Kernel::HandleTable thread_wakeup_callback_handle_table;
@@ -213,7 +213,7 @@ u64 KernelCore::CreateNewProcessID() {
213 return impl->next_process_id++; 213 return impl->next_process_id++;
214} 214}
215 215
216CoreTiming::EventType* KernelCore::ThreadWakeupCallbackEventType() const { 216Core::Timing::EventType* KernelCore::ThreadWakeupCallbackEventType() const {
217 return impl->thread_wakeup_event_type; 217 return impl->thread_wakeup_event_type;
218} 218}
219 219