Use Nested Namespace Definition

8 files changed, 16 insertions, 16 deletions

diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/BuildInfo.h
index 49811d521..c90ad7a4e 100644
--- a/toolsrc/include/BuildInfo.h
+++ b/toolsrc/include/BuildInfo.h
@@ -4,7 +4,7 @@
 #include "Paragraphs.h"
 #include <regex>
 
-namespace vcpkg { namespace PostBuildLint
+namespace vcpkg::PostBuildLint
 {
     enum class LinkageType
     {
@@ -126,4 +126,4 @@ namespace vcpkg { namespace PostBuildLint
     };
 
     BuildInfo read_build_info(const fs::path& filepath);
-}}
+}
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index 9e9fafe49..761b49759 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -3,8 +3,8 @@
 #include "filesystem_fs.h"
 #include <unordered_map>
 
-namespace vcpkg { namespace Paragraphs
+namespace vcpkg::Paragraphs
 {
     std::vector<std::unordered_map<std::string, std::string>> get_paragraphs(const fs::path& control_path);
     std::vector<std::unordered_map<std::string, std::string>> parse_paragraphs(const std::string& str);
-}}
+}
diff --git a/toolsrc/include/vcpkg_info.h b/toolsrc/include/vcpkg_info.h
index 01da06307..5380e0158 100644
--- a/toolsrc/include/vcpkg_info.h
+++ b/toolsrc/include/vcpkg_info.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-namespace vcpkg { namespace Info
+namespace vcpkg::Info
 {
     const std::string& version();
 
     const std::string& email();
-}}
+}
diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h
index 019bb8c39..8a08513f3 100644
--- a/toolsrc/include/vcpkglib_helpers.h
+++ b/toolsrc/include/vcpkglib_helpers.h
@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 
-namespace vcpkg {namespace details
+namespace vcpkg::details
 {
     std::string optional_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname);
     std::string remove_optional_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname);
@@ -11,4 +11,4 @@ namespace vcpkg {namespace details
     std::string remove_required_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname);
 
     std::string shorten_description(const std::string& desc);
-}}
+}
diff --git a/toolsrc/src/BuildInfo.cpp b/toolsrc/src/BuildInfo.cpp
index f151a3ea5..a45dc4b72 100644
--- a/toolsrc/src/BuildInfo.cpp
+++ b/toolsrc/src/BuildInfo.cpp
@@ -2,7 +2,7 @@
 #include "vcpkg_Checks.h"
 #include "vcpkglib_helpers.h"
 
-namespace vcpkg { namespace PostBuildLint
+namespace vcpkg::PostBuildLint
 {
     const ConfigurationType& BuildType::config() const
     {
@@ -161,4 +161,4 @@ namespace vcpkg { namespace PostBuildLint
     {
         return this->m_dll_name;
     }
-}}
+}
diff --git a/toolsrc/src/Paragraphs.cpp b/toolsrc/src/Paragraphs.cpp
index 823b4a85e..d99ad45cf 100644
--- a/toolsrc/src/Paragraphs.cpp
+++ b/toolsrc/src/Paragraphs.cpp
@@ -1,7 +1,7 @@
 #include "Paragraphs.h"
 #include "vcpkg_Files.h"
 
-namespace vcpkg { namespace Paragraphs
+namespace vcpkg::Paragraphs
 {
     struct Parser
     {
@@ -160,4 +160,4 @@ namespace vcpkg { namespace Paragraphs
     {
         return Parser(str.c_str(), str.c_str() + str.size()).get_paragraphs();
     }
-}}
+}
diff --git a/toolsrc/src/vcpkg_info.cpp b/toolsrc/src/vcpkg_info.cpp
index 25c09d6da..69bc6a355 100644
--- a/toolsrc/src/vcpkg_info.cpp
+++ b/toolsrc/src/vcpkg_info.cpp
@@ -6,7 +6,7 @@
 
 #define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION)"" // Double quotes needed at the end to prevent blank token
 
-namespace vcpkg { namespace Info
+namespace vcpkg::Info
 {
     const std::string& version()
     {
@@ -31,4 +31,4 @@ namespace vcpkg { namespace Info
         static const std::string s_email = R"(vcpkg@microsoft.com)";
         return s_email;
     }
-}}
+}
diff --git a/toolsrc/src/vcpkglib_helpers.cpp b/toolsrc/src/vcpkglib_helpers.cpp
index d104bb19d..fdc287507 100644
--- a/toolsrc/src/vcpkglib_helpers.cpp
+++ b/toolsrc/src/vcpkglib_helpers.cpp
@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include <regex>
 
-namespace vcpkg {namespace details
+namespace vcpkg::details
 {
     std::string optional_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname)
     {
@@ -53,4 +53,4 @@ namespace vcpkg {namespace details
             simple_desc.append("...");
         return simple_desc;
     }
-}}
+}