Merge pull request #8199 from lioncash/namespace

General: Use nested namespace specifiers where applicable

2 files changed, 4 insertions, 10 deletions

diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp
index 00685beba4..d9dc03f6a1 100644
--- a/Source/Core/Common/Crypto/AES.cpp
+++ b/Source/Core/Common/Crypto/AES.cpp
@@ -6,9 +6,7 @@
 
 #include "Common/Crypto/AES.h"
 
-namespace Common
-{
-namespace AES
+namespace Common::AES
 {
 std::vector<u8> DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size, Mode mode)
 {
@@ -35,5 +33,4 @@ std::vector<u8> Encrypt(const u8* key, u8* iv, const u8* src, size_t size)
 {
   return DecryptEncrypt(key, iv, src, size, Mode::Encrypt);
 }
-}  // namespace AES
-}  // namespace Common
+}  // namespace Common::AES
diff --git a/Source/Core/Common/Crypto/AES.h b/Source/Core/Common/Crypto/AES.h
index 3122f5fea7..1e3e6458d0 100644
--- a/Source/Core/Common/Crypto/AES.h
+++ b/Source/Core/Common/Crypto/AES.h
@@ -9,9 +9,7 @@
 
 #include "Common/CommonTypes.h"
 
-namespace Common
-{
-namespace AES
+namespace Common::AES
 {
 enum class Mode
 {
@@ -23,5 +21,4 @@ std::vector<u8> DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size
 // Convenience functions
 std::vector<u8> Decrypt(const u8* key, u8* iv, const u8* src, size_t size);
 std::vector<u8> Encrypt(const u8* key, u8* iv, const u8* src, size_t size);
-}  // namespace AES
-}  // namespace Common
+}  // namespace Common::AES