aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-01-05 12:47:08 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-01-05 12:55:28 -0800
commit0b5e2e9e76e66b566cf4d3f68146fdbdff2bac05 (patch)
tree5eca03ad9eeb2c91bcafa28fe3557e92b561524b /toolsrc/src
parentb280f57002044036c1c3c9a446c06e8e0a34fb00 (diff)
downloadvcpkg-0b5e2e9e76e66b566cf4d3f68146fdbdff2bac05.tar.gz
vcpkg-0b5e2e9e76e66b566cf4d3f68146fdbdff2bac05.zip
Use nested namespace definition
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg_Checks.cpp4
-rw-r--r--toolsrc/src/vcpkg_Files.cpp4
-rw-r--r--toolsrc/src/vcpkg_Strings.cpp8
-rw-r--r--toolsrc/src/vcpkg_System.cpp6
4 files changed, 11 insertions, 11 deletions
diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index 817ac9e96..46b28e55c 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -3,7 +3,7 @@
#include <stdexcept>
#include "vcpkg_System.h"
-namespace vcpkg {namespace Checks
+namespace vcpkg::Checks
{
void unreachable()
{
@@ -41,4 +41,4 @@ namespace vcpkg {namespace Checks
exit_with_message(errorMessage);
}
}
-}}
+}
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 48283e43f..1d4faa773 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -3,7 +3,7 @@
#include <regex>
#include "vcpkg_System.h"
-namespace vcpkg {namespace Files
+namespace vcpkg::Files
{
static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])");
@@ -140,4 +140,4 @@ namespace vcpkg {namespace Files
}
System::println("");
}
-}}
+}
diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index 46a4b1855..cf7d3b0ee 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -7,7 +7,7 @@
#include <functional>
#include <cctype>
-namespace vcpkg {namespace Strings {namespace details
+namespace vcpkg::Strings::details
{
// To disambiguate between two overloads
static const auto isspace = [](const char c)
@@ -40,9 +40,9 @@ namespace vcpkg {namespace Strings {namespace details
return output;
}
-}}}
+}
-namespace vcpkg {namespace Strings
+namespace vcpkg::Strings
{
std::wstring utf8_to_utf16(const std::string& s)
{
@@ -119,4 +119,4 @@ namespace vcpkg {namespace Strings
return s == "";
}), strings->end());
}
-}}
+}
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index 43eae3412..405dfd1b8 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -3,7 +3,7 @@
#include <Windows.h>
#include <regex>
-namespace vcpkg {namespace System
+namespace vcpkg::System
{
fs::path get_exe_path_of_current_process()
{
@@ -104,6 +104,6 @@ namespace vcpkg {namespace System
double Stopwatch2::microseconds() const
{
return (reinterpret_cast<const LARGE_INTEGER*>(&end_time)->QuadPart -
- reinterpret_cast<const LARGE_INTEGER*>(&start_time)->QuadPart) * 1000000.0 / reinterpret_cast<const LARGE_INTEGER*>(&freq)->QuadPart;
+ reinterpret_cast<const LARGE_INTEGER*>(&start_time)->QuadPart) * 1000000.0 / reinterpret_cast<const LARGE_INTEGER*>(&freq)->QuadPart;
}
-}}
+}