From 8e030a4a456cc74289cbed89ee8bbca60c9acc34 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Jun 2019 16:36:48 -0400 Subject: [PATCH] Common: Use nested namespace specifiers where applicable --- Source/Core/Common/Crypto/AES.cpp | 7 ++----- Source/Core/Common/Crypto/AES.h | 7 ++----- 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 DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size, Mode mode) { @@ -35,5 +33,4 @@ std::vector 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 DecryptEncrypt(const u8* key, u8* iv, const u8* src, size_t size // Convenience functions std::vector Decrypt(const u8* key, u8* iv, const u8* src, size_t size); std::vector Encrypt(const u8* key, u8* iv, const u8* src, size_t size); -} // namespace AES -} // namespace Common +} // namespace Common::AES