diff options
| author |  bunnei | 2019-02-12 19:26:37 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-12 19:26:37 -0500 |
| commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
| tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/core_timing.cpp | |
| parent | Merge pull request #2104 from ReinUsesLisp/compute-assert (diff) | |
| parent | core_timing: Rename CoreTiming namespace to Core::Timing (diff) | |
| download | yuzu-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/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 7953c8720..2b7ca9766 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include "common/threadsafe_queue.h" | 15 | #include "common/threadsafe_queue.h" |
| 16 | #include "core/core_timing_util.h" | 16 | #include "core/core_timing_util.h" |
| 17 | 17 | ||
| 18 | namespace CoreTiming { | 18 | namespace Core::Timing { |
| 19 | 19 | ||
| 20 | static s64 global_timer; | 20 | static s64 global_timer; |
| 21 | static int slice_length; | 21 | static int slice_length; |
| @@ -242,4 +242,4 @@ int GetDowncount() { | |||
| 242 | return downcount; | 242 | return downcount; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | } // namespace CoreTiming | 245 | } // namespace Core::Timing |