From 88b5791b0bcaa9cce7f488bbd03042aa65e4417e Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Jan 2017 14:14:11 -0800
Subject: [PATCH] Use Nested Namespace Definition

---
 toolsrc/include/coff_file_reader.h   | 4 ++--
 toolsrc/include/post_build_lint.h    | 4 ++--
 toolsrc/include/vcpkg_Dependencies.h | 4 ++--
 toolsrc/include/vcpkg_Environment.h  | 4 ++--
 toolsrc/include/vcpkg_Input.h        | 4 ++--
 toolsrc/src/coff_file_reader.cpp     | 4 ++--
 toolsrc/src/post_build_lint.cpp      | 4 ++--
 toolsrc/src/vcpkg_Dependencies.cpp   | 4 ++--
 toolsrc/src/vcpkg_Environment.cpp    | 4 ++--
 toolsrc/src/vcpkg_Input.cpp          | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/toolsrc/include/coff_file_reader.h b/toolsrc/include/coff_file_reader.h
index edf6910a5..24fbf4576 100644
--- a/toolsrc/include/coff_file_reader.h
+++ b/toolsrc/include/coff_file_reader.h
@@ -3,7 +3,7 @@
 #include "MachineType.h"
 #include "filesystem_fs.h"
 
-namespace vcpkg {namespace COFFFileReader
+namespace vcpkg::COFFFileReader
 {
     struct dll_info
     {
@@ -18,4 +18,4 @@ namespace vcpkg {namespace COFFFileReader
     dll_info read_dll(const fs::path& path);
 
     lib_info read_lib(const fs::path& path);
-}}
+}
diff --git a/toolsrc/include/post_build_lint.h b/toolsrc/include/post_build_lint.h
index a5fb9149f..215a237aa 100644
--- a/toolsrc/include/post_build_lint.h
+++ b/toolsrc/include/post_build_lint.h
@@ -2,7 +2,7 @@
 #include "package_spec.h"
 #include "vcpkg_paths.h"
 
-namespace vcpkg {namespace PostBuildLint
+namespace vcpkg::PostBuildLint
 {
     void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths);
-}}
+}
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
index 3616e6be9..4da9de694 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -4,7 +4,7 @@
 #include "StatusParagraphs.h"
 #include "vcpkg_paths.h"
 
-namespace vcpkg {namespace Dependencies
+namespace vcpkg::Dependencies
 {
     enum class install_plan_type
     {
@@ -27,4 +27,4 @@ namespace vcpkg {namespace Dependencies
     };
 
     std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
-}}
+}
diff --git a/toolsrc/include/vcpkg_Environment.h b/toolsrc/include/vcpkg_Environment.h
index 877ac7deb..1e8624d89 100644
--- a/toolsrc/include/vcpkg_Environment.h
+++ b/toolsrc/include/vcpkg_Environment.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "vcpkg_paths.h"
 
-namespace vcpkg {namespace Environment
+namespace vcpkg::Environment
 {
     void ensure_nuget_on_path(const vcpkg_paths& paths);
 
@@ -14,4 +14,4 @@ namespace vcpkg {namespace Environment
         ensure_cmake_on_path(paths);
         ensure_git_on_path(paths);
     }
-}}
+}
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index 5ce90e3b9..3cce334c4 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -3,7 +3,7 @@
 #include "package_spec.h"
 #include "vcpkg_paths.h"
 
-namespace vcpkg {namespace Input
+namespace vcpkg::Input
 {
     package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const std::string& example_text);
 
@@ -12,4 +12,4 @@ namespace vcpkg {namespace Input
     void check_triplet(const triplet& t, const vcpkg_paths& paths);
 
     void check_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths);
-}}
+}
diff --git a/toolsrc/src/coff_file_reader.cpp b/toolsrc/src/coff_file_reader.cpp
index 1f30ea70b..8ce714bbe 100644
--- a/toolsrc/src/coff_file_reader.cpp
+++ b/toolsrc/src/coff_file_reader.cpp
@@ -6,7 +6,7 @@
 
 using namespace std;
 
-namespace vcpkg { namespace COFFFileReader
+namespace vcpkg::COFFFileReader
 {
     template <class T>
     static T reinterpret_bytes(const char* data)
@@ -306,4 +306,4 @@ namespace vcpkg { namespace COFFFileReader
 
         return {std::vector<MachineType>(machine_types.cbegin(), machine_types.cend())};
     }
-}}
+}
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp
index 4f0adf677..1fca3a2f6 100644
--- a/toolsrc/src/post_build_lint.cpp
+++ b/toolsrc/src/post_build_lint.cpp
@@ -7,7 +7,7 @@
 #include "BuildInfo.h"
 #include <regex>
 
-namespace vcpkg { namespace PostBuildLint
+namespace vcpkg::PostBuildLint
 {
     enum class lint_status
     {
@@ -668,4 +668,4 @@ namespace vcpkg { namespace PostBuildLint
 
         System::println("-- Performing post-build validation done");
     }
-}}
+}
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index ae7f697fa..f1464a605 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -9,7 +9,7 @@
 #include "vcpkg_Files.h"
 #include "vcpkg.h"
 
-namespace vcpkg { namespace Dependencies
+namespace vcpkg::Dependencies
 {
     std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
     {
@@ -72,4 +72,4 @@ namespace vcpkg { namespace Dependencies
         }
         return ret;
     }
-}}
+}
diff --git a/toolsrc/src/vcpkg_Environment.cpp b/toolsrc/src/vcpkg_Environment.cpp
index ed70e6881..c7eec3bd0 100644
--- a/toolsrc/src/vcpkg_Environment.cpp
+++ b/toolsrc/src/vcpkg_Environment.cpp
@@ -5,7 +5,7 @@
 #include "metrics.h"
 #include "vcpkg_System.h"
 
-namespace vcpkg {namespace Environment
+namespace vcpkg::Environment
 {
     static const fs::path default_cmake_installation_dir = "C:/Program Files/CMake/bin";
     static const fs::path default_cmake_installation_dir_x86 = "C:/Program Files (x86)/CMake/bin";
@@ -83,4 +83,4 @@ namespace vcpkg {namespace Environment
         // TODO: switch out ExecutionPolicy Bypass with "Remove Mark Of The Web" code and restore RemoteSigned
         ensure_on_path(nuget_version, L"nuget 2>&1", L"powershell -ExecutionPolicy Bypass scripts\\fetchDependency.ps1 -Dependency nuget");
     }
-}}
+}
diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp
index 29d487fdb..a8145230c 100644
--- a/toolsrc/src/vcpkg_Input.cpp
+++ b/toolsrc/src/vcpkg_Input.cpp
@@ -3,7 +3,7 @@
 #include "metrics.h"
 #include "vcpkg_Commands.h"
 
-namespace vcpkg {namespace Input
+namespace vcpkg::Input
 {
     package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const std::string& example_text)
     {
@@ -49,4 +49,4 @@ namespace vcpkg {namespace Input
             check_triplet(spec.target_triplet(), paths);
         }
     }
-}}
+}