diff options
| author | bunnei <bunneidev@gmail.com> | 2019-02-16 21:37:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 21:37:21 +0100 |
| commit | e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22 (patch) | |
| tree | 671d3a729d5ed32125dcd687a0887448ff1bdd81 /src | |
| parent | Merge pull request #2127 from FearlessTobi/fix-screenshot-srgb (diff) | |
| parent | address_arbiter: Use nested namespaces where applicable (diff) | |
| download | yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar.gz yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar.bz2 yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar.lz yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar.xz yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.tar.zst yuzu-e869c5ef1a2214cb7f51c7ba1e4b8fe03a607a22.zip | |
Diffstat (limited to '')
| -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 @@ #include "core/hle/result.h" #include "core/memory.h" -namespace Kernel { -namespace AddressArbiter { +namespace Kernel::AddressArbiter { // Performs actual address waiting logic. static ResultCode WaitForAddress(VAddr address, s64 timeout) { @@ -176,5 +175,4 @@ ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout) { return WaitForAddress(address, timeout); } -} // namespace AddressArbiter -} // namespace Kernel +} // namespace Kernel::AddressArbiter 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 @@ union ResultCode; -namespace Kernel { +namespace Kernel::AddressArbiter { -namespace AddressArbiter { enum class ArbitrationType { WaitIfLessThan = 0, DecrementAndWaitIfLessThan = 1, @@ -29,6 +28,5 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement); ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout); -} // namespace AddressArbiter -} // namespace Kernel +} // namespace Kernel::AddressArbiter |