diff options
| author | 2019-02-16 12:41:28 -0500 | |
|---|---|---|
| committer | 2019-02-16 12:41:30 -0500 | |
| commit | 0113c36300202370b53c89b85375f6b1b3ea6f08 (patch) | |
| tree | ffa81e80104a0d0ff264664801347ead1c4a8a57 | |
| parent | Merge pull request #2123 from lioncash/coretiming-global (diff) | |
| download | yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.gz yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.xz yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.zip | |
address_arbiter: Use nested namespaces where applicable
A fairly trivial change. Other sections of the codebase use nested
namespaces instead of separate namespaces here. This one must have just
been overlooked.
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index 57157beb4..a250d088d 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp | |||
| @@ -17,8 +17,7 @@ | |||
| 17 | #include "core/hle/result.h" | 17 | #include "core/hle/result.h" |
| 18 | #include "core/memory.h" | 18 | #include "core/memory.h" |
| 19 | 19 | ||
| 20 | namespace Kernel { | 20 | namespace Kernel::AddressArbiter { |
| 21 | namespace AddressArbiter { | ||
| 22 | 21 | ||
| 23 | // Performs actual address waiting logic. | 22 | // Performs actual address waiting logic. |
| 24 | static ResultCode WaitForAddress(VAddr address, s64 timeout) { | 23 | static ResultCode WaitForAddress(VAddr address, s64 timeout) { |
| @@ -176,5 +175,4 @@ ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout) { | |||
| 176 | 175 | ||
| 177 | return WaitForAddress(address, timeout); | 176 | return WaitForAddress(address, timeout); |
| 178 | } | 177 | } |
| 179 | } // namespace AddressArbiter | 178 | } // namespace Kernel::AddressArbiter |
| 180 | } // namespace Kernel | ||
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h index e3657b8e9..b58f21bec 100644 --- a/src/core/hle/kernel/address_arbiter.h +++ b/src/core/hle/kernel/address_arbiter.h | |||
| @@ -8,9 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | union ResultCode; | 9 | union ResultCode; |
| 10 | 10 | ||
| 11 | namespace Kernel { | 11 | namespace Kernel::AddressArbiter { |
| 12 | 12 | ||
| 13 | namespace AddressArbiter { | ||
| 14 | enum class ArbitrationType { | 13 | enum class ArbitrationType { |
| 15 | WaitIfLessThan = 0, | 14 | WaitIfLessThan = 0, |
| 16 | DecrementAndWaitIfLessThan = 1, | 15 | DecrementAndWaitIfLessThan = 1, |
| @@ -29,6 +28,5 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu | |||
| 29 | 28 | ||
| 30 | ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement); | 29 | ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement); |
| 31 | ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout); | 30 | ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout); |
| 32 | } // namespace AddressArbiter | ||
| 33 | 31 | ||
| 34 | } // namespace Kernel | 32 | } // namespace Kernel::AddressArbiter |