mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 17:53:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use Nested Namespace Definition

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-01-05 14:14:11 -08:00
parent 1565cafb83
commit 88b5791b0b
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/include/coff_file_reader.h
View File

@ -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);
}}
}

4
toolsrc/include/post_build_lint.h
View File

@ -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);
}}
}

4
toolsrc/include/vcpkg_Dependencies.h
View File

@ -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);
}}
}

4
toolsrc/include/vcpkg_Environment.h
View File

@ -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);
}
}}
}

4
toolsrc/include/vcpkg_Input.h
View File

@ -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);
}}
}

4
toolsrc/src/coff_file_reader.cpp
View File

@ -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())};
}
}}
}

4
toolsrc/src/post_build_lint.cpp
View File

@ -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");
}
}}
}

4
toolsrc/src/vcpkg_Dependencies.cpp
View File

@ -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;
}
}}
}

4
toolsrc/src/vcpkg_Environment.cpp
View File

@ -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");
}
}}
}

4
toolsrc/src/vcpkg_Input.cpp
View File

@ -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);
}
}
}}
}