From 24878f7ac86f8c021d4e008216dabab54250a72b Mon Sep 17 00:00:00 2001 From: cngzhnp Date: Mon, 10 Aug 2020 01:35:21 +0300 Subject: [PATCH 1/5] Fix forward declarations and missing pragma once --- toolsrc/include/vcpkg/archives.h | 5 ++++- toolsrc/include/vcpkg/buildenvironment.h | 6 ++++-- toolsrc/include/vcpkg/cmakevars.h | 6 +++++- toolsrc/include/vcpkg/commands.contact.h | 1 + toolsrc/include/vcpkg/commands.create.h | 1 + toolsrc/include/vcpkg/commands.dependinfo.h | 1 + toolsrc/include/vcpkg/commands.edit.h | 1 + .../include/vcpkg/commands.format-manifest.h | 1 + toolsrc/include/vcpkg/commands.h | 11 ++++------- toolsrc/include/vcpkg/commands.info.h | 1 + toolsrc/include/vcpkg/commands.integrate.h | 1 + toolsrc/include/vcpkg/commands.interface.h | 13 +++++++++++-- toolsrc/include/vcpkg/commands.list.h | 1 + toolsrc/include/vcpkg/commands.owns.h | 1 + toolsrc/include/vcpkg/commands.search.h | 1 + toolsrc/include/vcpkg/commands.setinstalled.h | 1 + toolsrc/include/vcpkg/commands.upgrade.h | 1 + toolsrc/include/vcpkg/commands.xvsinstances.h | 1 + toolsrc/include/vcpkg/dependencies.h | 19 +++++++++++++++---- toolsrc/include/vcpkg/export.ifw.h | 6 +++++- toolsrc/include/vcpkg/help.h | 1 + toolsrc/src/vcpkg/archives.cpp | 1 + toolsrc/src/vcpkg/buildenvironment.cpp | 1 + toolsrc/src/vcpkg/commands.ciclean.cpp | 1 + toolsrc/src/vcpkg/commands.contact.cpp | 1 + toolsrc/src/vcpkg/commands.create.cpp | 2 ++ toolsrc/src/vcpkg/commands.fetch.cpp | 2 ++ toolsrc/src/vcpkg/commands.hash.cpp | 3 +++ toolsrc/src/vcpkg/commands.integrate.cpp | 1 + toolsrc/src/vcpkg/commands.porthistory.cpp | 1 + toolsrc/src/vcpkg/commands.version.cpp | 1 + toolsrc/src/vcpkg/commands.xvsinstances.cpp | 2 +- 32 files changed, 77 insertions(+), 19 deletions(-) diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h index 073217064b1fb1..b24e9234b57744 100644 --- a/toolsrc/include/vcpkg/archives.h +++ b/toolsrc/include/vcpkg/archives.h @@ -2,7 +2,10 @@ #include -#include +namespace vcpkg +{ + struct VcpkgPaths; +} namespace vcpkg::Archives { diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h index 1216caa2a018d0..a1684fa7ba41bb 100644 --- a/toolsrc/include/vcpkg/buildenvironment.h +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -1,12 +1,14 @@ -#include +#pragma once -#include +#include #include #include namespace vcpkg { + struct VcpkgPaths; + std::string make_cmake_cmd(const VcpkgPaths& paths, const fs::path& cmake_script, std::vector&& pass_variables); diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h index 1c02376b9ff2ed..4b2ab4edb77c7f 100644 --- a/toolsrc/include/vcpkg/cmakevars.h +++ b/toolsrc/include/vcpkg/cmakevars.h @@ -3,13 +3,17 @@ #include #include -#include namespace vcpkg::Dependencies { struct ActionPlan; } +namespace vcpkg +{ + struct VcpkgPaths; +} + namespace vcpkg::CMakeVars { struct CMakeVarProvider diff --git a/toolsrc/include/vcpkg/commands.contact.h b/toolsrc/include/vcpkg/commands.contact.h index f0af41c14aef4e..b218eb57aa6d0a 100644 --- a/toolsrc/include/vcpkg/commands.contact.h +++ b/toolsrc/include/vcpkg/commands.contact.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Contact { diff --git a/toolsrc/include/vcpkg/commands.create.h b/toolsrc/include/vcpkg/commands.create.h index a8eb99b273d0dd..138632dbbc0f92 100644 --- a/toolsrc/include/vcpkg/commands.create.h +++ b/toolsrc/include/vcpkg/commands.create.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Create { diff --git a/toolsrc/include/vcpkg/commands.dependinfo.h b/toolsrc/include/vcpkg/commands.dependinfo.h index 81301b6d9c6c9c..8e88adfb9091fa 100644 --- a/toolsrc/include/vcpkg/commands.dependinfo.h +++ b/toolsrc/include/vcpkg/commands.dependinfo.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::DependInfo { diff --git a/toolsrc/include/vcpkg/commands.edit.h b/toolsrc/include/vcpkg/commands.edit.h index 9a37d2ee3d2cfe..44c26a56dc62df 100644 --- a/toolsrc/include/vcpkg/commands.edit.h +++ b/toolsrc/include/vcpkg/commands.edit.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Edit { diff --git a/toolsrc/include/vcpkg/commands.format-manifest.h b/toolsrc/include/vcpkg/commands.format-manifest.h index 1317bbc705febc..dfa2a5b4a6bd50 100644 --- a/toolsrc/include/vcpkg/commands.format-manifest.h +++ b/toolsrc/include/vcpkg/commands.format-manifest.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::FormatManifest { diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index 948d4b5e84f78b..38afdfa89c1b0f 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -1,16 +1,13 @@ #pragma once #include -#include -#include -#include - -#include -#include -#include namespace vcpkg::Commands { + struct BasicCommand; + struct PathsCommand; + struct TripletCommand; + template struct PackageNameAndFunction { diff --git a/toolsrc/include/vcpkg/commands.info.h b/toolsrc/include/vcpkg/commands.info.h index 556d1eb012da82..221248e590ad53 100644 --- a/toolsrc/include/vcpkg/commands.info.h +++ b/toolsrc/include/vcpkg/commands.info.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Info { diff --git a/toolsrc/include/vcpkg/commands.integrate.h b/toolsrc/include/vcpkg/commands.integrate.h index 162f49a3c34baf..e009b9e5a045e2 100644 --- a/toolsrc/include/vcpkg/commands.integrate.h +++ b/toolsrc/include/vcpkg/commands.integrate.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Integrate { diff --git a/toolsrc/include/vcpkg/commands.interface.h b/toolsrc/include/vcpkg/commands.interface.h index 10d213522007bc..e6ac3b326bc52f 100644 --- a/toolsrc/include/vcpkg/commands.interface.h +++ b/toolsrc/include/vcpkg/commands.interface.h @@ -1,7 +1,16 @@ #pragma once -#include -#include +#include + +namespace vcpkg +{ + struct VcpkgCmdArguments; + struct VcpkgPaths; + namespace Files + { + struct Filesystem; + } +} namespace vcpkg::Commands { diff --git a/toolsrc/include/vcpkg/commands.list.h b/toolsrc/include/vcpkg/commands.list.h index 77a5f41bdb3217..41e1a6e65cab1e 100644 --- a/toolsrc/include/vcpkg/commands.list.h +++ b/toolsrc/include/vcpkg/commands.list.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::List { diff --git a/toolsrc/include/vcpkg/commands.owns.h b/toolsrc/include/vcpkg/commands.owns.h index 13676b2bd96a36..39037649da3b0e 100644 --- a/toolsrc/include/vcpkg/commands.owns.h +++ b/toolsrc/include/vcpkg/commands.owns.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Owns { diff --git a/toolsrc/include/vcpkg/commands.search.h b/toolsrc/include/vcpkg/commands.search.h index 6220a886630e5c..530a3ac2816e0c 100644 --- a/toolsrc/include/vcpkg/commands.search.h +++ b/toolsrc/include/vcpkg/commands.search.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Search { diff --git a/toolsrc/include/vcpkg/commands.setinstalled.h b/toolsrc/include/vcpkg/commands.setinstalled.h index c5723669bd7307..0dab45f085a7d3 100644 --- a/toolsrc/include/vcpkg/commands.setinstalled.h +++ b/toolsrc/include/vcpkg/commands.setinstalled.h @@ -3,6 +3,7 @@ #include #include #include +#include namespace vcpkg::Commands::SetInstalled { diff --git a/toolsrc/include/vcpkg/commands.upgrade.h b/toolsrc/include/vcpkg/commands.upgrade.h index 340a70c97cd42b..ef8c546f2cfe1a 100644 --- a/toolsrc/include/vcpkg/commands.upgrade.h +++ b/toolsrc/include/vcpkg/commands.upgrade.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::Upgrade { diff --git a/toolsrc/include/vcpkg/commands.xvsinstances.h b/toolsrc/include/vcpkg/commands.xvsinstances.h index fc7a39b98bc5ba..5bfb805ea9063b 100644 --- a/toolsrc/include/vcpkg/commands.xvsinstances.h +++ b/toolsrc/include/vcpkg/commands.xvsinstances.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace vcpkg::Commands::X_VSInstances { diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 76ff89e7a4f077..3cca364e7c4552 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -4,11 +4,7 @@ #include #include -#include #include -#include -#include -#include #include #include @@ -19,6 +15,21 @@ namespace vcpkg::Graphs struct Randomizer; } +namespace vcpkg::CMakeVars +{ + struct CMakeVarProvider; +} + +namespace vcpkg::PortFileProvider +{ + struct PortFileProvider; +} + +namespace vcpkg +{ + struct StatusParagraphs; +} + namespace vcpkg::Dependencies { enum class RequestType diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h index b1573924ed987f..02d66e379d5cc2 100644 --- a/toolsrc/include/vcpkg/export.ifw.h +++ b/toolsrc/include/vcpkg/export.ifw.h @@ -1,11 +1,15 @@ #pragma once #include -#include #include #include +namespace vcpkg +{ + struct VcpkgPaths; +} + namespace vcpkg::Export::IFW { struct Options diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h index 3e1ef381e41317..eadc9960e9e48f 100644 --- a/toolsrc/include/vcpkg/help.h +++ b/toolsrc/include/vcpkg/help.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index c90706928eeea6..33edc8e83fffbb 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace vcpkg::Archives { diff --git a/toolsrc/src/vcpkg/buildenvironment.cpp b/toolsrc/src/vcpkg/buildenvironment.cpp index 09d84d0e88075b..2b63a16b508572 100644 --- a/toolsrc/src/vcpkg/buildenvironment.cpp +++ b/toolsrc/src/vcpkg/buildenvironment.cpp @@ -1,5 +1,6 @@ #include #include +#include namespace vcpkg { diff --git a/toolsrc/src/vcpkg/commands.ciclean.cpp b/toolsrc/src/vcpkg/commands.ciclean.cpp index 21ae756ed43294..9d3b396400e026 100644 --- a/toolsrc/src/vcpkg/commands.ciclean.cpp +++ b/toolsrc/src/vcpkg/commands.ciclean.cpp @@ -4,6 +4,7 @@ #include #include +#include using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp index 2c8c7b1b2857b1..8478f394e88cce 100644 --- a/toolsrc/src/vcpkg/commands.contact.cpp +++ b/toolsrc/src/vcpkg/commands.contact.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index a7cfbc9318e626..0b2133dd15c2bf 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -1,9 +1,11 @@ #include #include +#include #include #include #include +#include namespace vcpkg::Commands::Create { diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index e6e59a30c15c10..b4b80b3553e1b5 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -1,6 +1,8 @@ #include #include +#include +#include namespace vcpkg::Commands::Fetch { diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 5ac5e8aa6d4f1a..3e9d151d127c8a 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -1,7 +1,10 @@ #include #include +#include #include +#include +#include namespace vcpkg::Commands::Hash { diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 1aa7d58649bf57..0309f6242cf7da 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace vcpkg::Commands::Integrate { diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 6f45e26ed0f115..9d353b6f330f37 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace vcpkg::Commands::PortHistory { diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index d366a42b83a85e..5fc77c738393e6 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #define STRINGIFY(...) #__VA_ARGS__ #define MACRO_TO_STRING(X) STRINGIFY(X) diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp index 4ad9744c90e557..bdc817c9c8b7cd 100644 --- a/toolsrc/src/vcpkg/commands.xvsinstances.cpp +++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp @@ -27,7 +27,7 @@ namespace vcpkg::Commands::X_VSInstances Checks::exit_success(VCPKG_LINE_INFO); #else - Util::unused(args, paths); + (void)(args, paths); Checks::exit_with_message(VCPKG_LINE_INFO, "This command is not supported on non-windows platforms."); #endif } From 439ae6be4375cbbb77aa07bec49ab7e68472c2c6 Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Mon, 17 Aug 2020 09:17:27 -0700 Subject: [PATCH 2/5] add `fwd` declaration headers --- toolsrc/.clang-format | 8 +++++--- toolsrc/include/vcpkg/archives.h | 5 +---- toolsrc/include/vcpkg/buildenvironment.h | 4 ++-- toolsrc/include/vcpkg/cmakevars.h | 7 ++----- toolsrc/include/vcpkg/commands.contact.h | 1 - toolsrc/include/vcpkg/commands.create.h | 1 - toolsrc/include/vcpkg/commands.dependinfo.h | 1 - toolsrc/include/vcpkg/commands.edit.h | 1 - toolsrc/include/vcpkg/commands.format-manifest.h | 1 - toolsrc/include/vcpkg/commands.h | 2 ++ toolsrc/include/vcpkg/commands.info.h | 1 - toolsrc/include/vcpkg/commands.integrate.h | 1 - toolsrc/include/vcpkg/commands.interface.h | 13 ++++--------- toolsrc/include/vcpkg/commands.list.h | 1 - toolsrc/include/vcpkg/commands.setinstalled.h | 1 - toolsrc/include/vcpkg/commands.upgrade.h | 1 - toolsrc/include/vcpkg/commands.xvsinstances.h | 1 - toolsrc/include/vcpkg/export.ifw.h | 7 ++----- toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h | 13 +++++++++++++ toolsrc/include/vcpkg/fwd/vcpkgpaths.h | 8 ++++++++ toolsrc/include/vcpkg/help.h | 1 - toolsrc/include/vcpkg/statusparagraph.h | 4 +++- toolsrc/include/vcpkg/tools.h | 4 ++-- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 5 +++-- toolsrc/include/vcpkg/vcpkgpaths.h | 2 ++ toolsrc/src/vcpkg/commands.autocomplete.cpp | 1 + toolsrc/src/vcpkg/commands.buildexternal.cpp | 1 + toolsrc/src/vcpkg/commands.cache.cpp | 1 + toolsrc/src/vcpkg/commands.ci.cpp | 1 + toolsrc/src/vcpkg/commands.ciclean.cpp | 1 + toolsrc/src/vcpkg/commands.contact.cpp | 1 + toolsrc/src/vcpkg/commands.create.cpp | 1 + toolsrc/src/vcpkg/commands.dependinfo.cpp | 1 + toolsrc/src/vcpkg/commands.edit.cpp | 1 + toolsrc/src/vcpkg/commands.env.cpp | 1 + toolsrc/src/vcpkg/commands.fetch.cpp | 1 + toolsrc/src/vcpkg/commands.format-manifest.cpp | 1 + toolsrc/src/vcpkg/commands.hash.cpp | 1 + toolsrc/src/vcpkg/commands.info.cpp | 1 + toolsrc/src/vcpkg/commands.integrate.cpp | 1 + toolsrc/src/vcpkg/commands.list.cpp | 1 + toolsrc/src/vcpkg/commands.owns.cpp | 1 + toolsrc/src/vcpkg/commands.porthistory.cpp | 1 + toolsrc/src/vcpkg/commands.portsdiff.cpp | 1 + toolsrc/src/vcpkg/commands.search.cpp | 1 + toolsrc/src/vcpkg/commands.setinstalled.cpp | 1 + toolsrc/src/vcpkg/commands.upgrade.cpp | 1 + toolsrc/src/vcpkg/commands.version.cpp | 1 + toolsrc/src/vcpkg/commands.xvsinstances.cpp | 1 + 49 files changed, 73 insertions(+), 45 deletions(-) create mode 100644 toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h create mode 100644 toolsrc/include/vcpkg/fwd/vcpkgpaths.h diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format index 6c32a733ae18c4..ea9cb97ee1ae18 100644 --- a/toolsrc/.clang-format +++ b/toolsrc/.clang-format @@ -42,9 +42,11 @@ IncludeCategories: Priority: 1 - Regex: '^$' Priority: 2 - - Regex: '^$' + - Regex: '^$' Priority: 3 - - Regex: '^<[a-z0-9_]*\.h>$' + - Regex: '^$' Priority: 4 - - Regex: '^<[a-z0-9_]*>$' # C++ standard library + - Regex: '^<[a-z0-9_]*\.h>$' Priority: 5 + - Regex: '^<[a-z0-9_]*>$' # C++ standard library + Priority: 6 diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h index b24e9234b57744..addb2d5a6e4cb8 100644 --- a/toolsrc/include/vcpkg/archives.h +++ b/toolsrc/include/vcpkg/archives.h @@ -2,10 +2,7 @@ #include -namespace vcpkg -{ - struct VcpkgPaths; -} +#include namespace vcpkg::Archives { diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h index a1684fa7ba41bb..6757e5a91e8720 100644 --- a/toolsrc/include/vcpkg/buildenvironment.h +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -2,13 +2,13 @@ #include +#include + #include #include namespace vcpkg { - struct VcpkgPaths; - std::string make_cmake_cmd(const VcpkgPaths& paths, const fs::path& cmake_script, std::vector&& pass_variables); diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h index 4b2ab4edb77c7f..9e23aefb6db556 100644 --- a/toolsrc/include/vcpkg/cmakevars.h +++ b/toolsrc/include/vcpkg/cmakevars.h @@ -2,6 +2,8 @@ #include +#include + #include namespace vcpkg::Dependencies @@ -9,11 +11,6 @@ namespace vcpkg::Dependencies struct ActionPlan; } -namespace vcpkg -{ - struct VcpkgPaths; -} - namespace vcpkg::CMakeVars { struct CMakeVarProvider diff --git a/toolsrc/include/vcpkg/commands.contact.h b/toolsrc/include/vcpkg/commands.contact.h index b218eb57aa6d0a..f0af41c14aef4e 100644 --- a/toolsrc/include/vcpkg/commands.contact.h +++ b/toolsrc/include/vcpkg/commands.contact.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Contact { diff --git a/toolsrc/include/vcpkg/commands.create.h b/toolsrc/include/vcpkg/commands.create.h index 138632dbbc0f92..a8eb99b273d0dd 100644 --- a/toolsrc/include/vcpkg/commands.create.h +++ b/toolsrc/include/vcpkg/commands.create.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Create { diff --git a/toolsrc/include/vcpkg/commands.dependinfo.h b/toolsrc/include/vcpkg/commands.dependinfo.h index 8e88adfb9091fa..81301b6d9c6c9c 100644 --- a/toolsrc/include/vcpkg/commands.dependinfo.h +++ b/toolsrc/include/vcpkg/commands.dependinfo.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::DependInfo { diff --git a/toolsrc/include/vcpkg/commands.edit.h b/toolsrc/include/vcpkg/commands.edit.h index 44c26a56dc62df..9a37d2ee3d2cfe 100644 --- a/toolsrc/include/vcpkg/commands.edit.h +++ b/toolsrc/include/vcpkg/commands.edit.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Edit { diff --git a/toolsrc/include/vcpkg/commands.format-manifest.h b/toolsrc/include/vcpkg/commands.format-manifest.h index dfa2a5b4a6bd50..1317bbc705febc 100644 --- a/toolsrc/include/vcpkg/commands.format-manifest.h +++ b/toolsrc/include/vcpkg/commands.format-manifest.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::FormatManifest { diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index 38afdfa89c1b0f..2b8aa5220af2b3 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -1,5 +1,7 @@ #pragma once +#include + #include namespace vcpkg::Commands diff --git a/toolsrc/include/vcpkg/commands.info.h b/toolsrc/include/vcpkg/commands.info.h index 221248e590ad53..556d1eb012da82 100644 --- a/toolsrc/include/vcpkg/commands.info.h +++ b/toolsrc/include/vcpkg/commands.info.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Info { diff --git a/toolsrc/include/vcpkg/commands.integrate.h b/toolsrc/include/vcpkg/commands.integrate.h index e009b9e5a045e2..162f49a3c34baf 100644 --- a/toolsrc/include/vcpkg/commands.integrate.h +++ b/toolsrc/include/vcpkg/commands.integrate.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Integrate { diff --git a/toolsrc/include/vcpkg/commands.interface.h b/toolsrc/include/vcpkg/commands.interface.h index e6ac3b326bc52f..7e31dc52d2e9f7 100644 --- a/toolsrc/include/vcpkg/commands.interface.h +++ b/toolsrc/include/vcpkg/commands.interface.h @@ -2,15 +2,10 @@ #include -namespace vcpkg -{ - struct VcpkgCmdArguments; - struct VcpkgPaths; - namespace Files - { - struct Filesystem; - } -} +#include + +#include +#include namespace vcpkg::Commands { diff --git a/toolsrc/include/vcpkg/commands.list.h b/toolsrc/include/vcpkg/commands.list.h index 41e1a6e65cab1e..77a5f41bdb3217 100644 --- a/toolsrc/include/vcpkg/commands.list.h +++ b/toolsrc/include/vcpkg/commands.list.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::List { diff --git a/toolsrc/include/vcpkg/commands.setinstalled.h b/toolsrc/include/vcpkg/commands.setinstalled.h index 0dab45f085a7d3..c5723669bd7307 100644 --- a/toolsrc/include/vcpkg/commands.setinstalled.h +++ b/toolsrc/include/vcpkg/commands.setinstalled.h @@ -3,7 +3,6 @@ #include #include #include -#include namespace vcpkg::Commands::SetInstalled { diff --git a/toolsrc/include/vcpkg/commands.upgrade.h b/toolsrc/include/vcpkg/commands.upgrade.h index ef8c546f2cfe1a..340a70c97cd42b 100644 --- a/toolsrc/include/vcpkg/commands.upgrade.h +++ b/toolsrc/include/vcpkg/commands.upgrade.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::Upgrade { diff --git a/toolsrc/include/vcpkg/commands.xvsinstances.h b/toolsrc/include/vcpkg/commands.xvsinstances.h index 5bfb805ea9063b..fc7a39b98bc5ba 100644 --- a/toolsrc/include/vcpkg/commands.xvsinstances.h +++ b/toolsrc/include/vcpkg/commands.xvsinstances.h @@ -1,7 +1,6 @@ #pragma once #include -#include namespace vcpkg::Commands::X_VSInstances { diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h index 02d66e379d5cc2..02dd348d8b5782 100644 --- a/toolsrc/include/vcpkg/export.ifw.h +++ b/toolsrc/include/vcpkg/export.ifw.h @@ -2,14 +2,11 @@ #include +#include + #include #include -namespace vcpkg -{ - struct VcpkgPaths; -} - namespace vcpkg::Export::IFW { struct Options diff --git a/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h new file mode 100644 index 00000000000000..e323447e650f03 --- /dev/null +++ b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h @@ -0,0 +1,13 @@ +#pragma once + +namespace vcpkg +{ + struct ParsedArguments; + struct CommandSwitch; + struct CommandSetting; + struct CommandMultiSetting; + struct CommandOptionsStructure; + struct CommandStructure; + struct HelpTableFormatter; + struct VcpkgCmdArguments; +} diff --git a/toolsrc/include/vcpkg/fwd/vcpkgpaths.h b/toolsrc/include/vcpkg/fwd/vcpkgpaths.h new file mode 100644 index 00000000000000..79655bf4a78ac1 --- /dev/null +++ b/toolsrc/include/vcpkg/fwd/vcpkgpaths.h @@ -0,0 +1,8 @@ +#pragma once + +namespace vcpkg +{ + struct ToolsetArchOption; + struct Toolset; + struct VcpkgPaths; +} diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h index eadc9960e9e48f..3e1ef381e41317 100644 --- a/toolsrc/include/vcpkg/help.h +++ b/toolsrc/include/vcpkg/help.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include diff --git a/toolsrc/include/vcpkg/statusparagraph.h b/toolsrc/include/vcpkg/statusparagraph.h index cf4c3c0466758a..71aafbaa6dfeed 100644 --- a/toolsrc/include/vcpkg/statusparagraph.h +++ b/toolsrc/include/vcpkg/statusparagraph.h @@ -2,6 +2,8 @@ #include +#include + #include namespace vcpkg @@ -62,5 +64,5 @@ namespace vcpkg std::vector features; }; - Json::Value serialize_ipv(const InstalledPackageView& ipv, const struct VcpkgPaths& paths); + Json::Value serialize_ipv(const InstalledPackageView& ipv, const VcpkgPaths& paths); } diff --git a/toolsrc/include/vcpkg/tools.h b/toolsrc/include/vcpkg/tools.h index d5c0a5c23db572..b5b61277a66703 100644 --- a/toolsrc/include/vcpkg/tools.h +++ b/toolsrc/include/vcpkg/tools.h @@ -2,13 +2,13 @@ #include +#include + #include #include namespace vcpkg { - struct VcpkgPaths; - namespace Tools { static const std::string SEVEN_ZIP = "7zip"; diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index 84cd7c59925f07..aa1f0c470f3e44 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -5,6 +5,9 @@ #include #include +#include +#include + #include #include #include @@ -19,8 +22,6 @@ namespace vcpkg std::unordered_map> multisettings; }; - struct VcpkgPaths; - struct CommandSwitch { constexpr CommandSwitch(const StringLiteral& name, const StringLiteral& short_help_text) diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 721b59606943f2..7de1b3ef8e1d71 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -7,6 +7,8 @@ #include #include +#include + namespace vcpkg { struct ToolsetArchOption diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index ae01302cb93e1d..a8f54389c73210 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace vcpkg::Commands::Autocomplete { diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp index 02861918253fd1..bfd275542757ed 100644 --- a/toolsrc/src/vcpkg/commands.buildexternal.cpp +++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp @@ -4,6 +4,7 @@ #include #include #include +#include namespace vcpkg::Commands::BuildExternal { diff --git a/toolsrc/src/vcpkg/commands.cache.cpp b/toolsrc/src/vcpkg/commands.cache.cpp index 555b70859e19a3..164d2769f16c26 100644 --- a/toolsrc/src/vcpkg/commands.cache.cpp +++ b/toolsrc/src/vcpkg/commands.cache.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace vcpkg::Commands::Cache { diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 4dffcfd3c8f9dd..18cfee5eebe8c7 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -16,6 +16,7 @@ #include #include #include +#include using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/commands.ciclean.cpp b/toolsrc/src/vcpkg/commands.ciclean.cpp index 9d3b396400e026..3a41de3aa01975 100644 --- a/toolsrc/src/vcpkg/commands.ciclean.cpp +++ b/toolsrc/src/vcpkg/commands.ciclean.cpp @@ -5,6 +5,7 @@ #include #include #include +#include using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp index 8478f394e88cce..e40aa34b29236c 100644 --- a/toolsrc/src/vcpkg/commands.contact.cpp +++ b/toolsrc/src/vcpkg/commands.contact.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace vcpkg::Commands::Contact { diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 0b2133dd15c2bf..5ca72379c8d885 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace vcpkg::Commands::Create { diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp index 0f1e431e58fa85..8c14c4b3d197c2 100644 --- a/toolsrc/src/vcpkg/commands.dependinfo.cpp +++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index b66e8c6808c759..e3f50b98ca63cc 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp index a825230601d6cc..ed9263b7631be9 100644 --- a/toolsrc/src/vcpkg/commands.env.cpp +++ b/toolsrc/src/vcpkg/commands.env.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace vcpkg::Commands::Env { diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index b4b80b3553e1b5..5e7182cd483d7a 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace vcpkg::Commands::Fetch { diff --git a/toolsrc/src/vcpkg/commands.format-manifest.cpp b/toolsrc/src/vcpkg/commands.format-manifest.cpp index 656e1799647a0f..72f851700b02d4 100644 --- a/toolsrc/src/vcpkg/commands.format-manifest.cpp +++ b/toolsrc/src/vcpkg/commands.format-manifest.cpp @@ -7,6 +7,7 @@ #include #include #include +#include namespace { diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 3e9d151d127c8a..4eb17b80a46357 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace vcpkg::Commands::Hash { diff --git a/toolsrc/src/vcpkg/commands.info.cpp b/toolsrc/src/vcpkg/commands.info.cpp index afb2642c6e9396..548015ba9a627a 100644 --- a/toolsrc/src/vcpkg/commands.info.cpp +++ b/toolsrc/src/vcpkg/commands.info.cpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace vcpkg::Commands::Info { diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 0309f6242cf7da..0b8b39ffc4b57c 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace vcpkg::Commands::Integrate { diff --git a/toolsrc/src/vcpkg/commands.list.cpp b/toolsrc/src/vcpkg/commands.list.cpp index fcd2919ff172c5..4b291ca55eeaa6 100644 --- a/toolsrc/src/vcpkg/commands.list.cpp +++ b/toolsrc/src/vcpkg/commands.list.cpp @@ -4,6 +4,7 @@ #include #include #include +#include namespace vcpkg::Commands::List { diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp index 29cfe3a2300e87..1a2e88ed57bf35 100644 --- a/toolsrc/src/vcpkg/commands.owns.cpp +++ b/toolsrc/src/vcpkg/commands.owns.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace vcpkg::Commands::Owns { diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 9d353b6f330f37..5b3f8985a17c72 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace vcpkg::Commands::PortHistory { diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index ad27599fbbeaeb..348944d42b5494 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace vcpkg::Commands::PortsDiff { diff --git a/toolsrc/src/vcpkg/commands.search.cpp b/toolsrc/src/vcpkg/commands.search.cpp index 836acfffeea1f5..80988e9eb1068d 100644 --- a/toolsrc/src/vcpkg/commands.search.cpp +++ b/toolsrc/src/vcpkg/commands.search.cpp @@ -8,6 +8,7 @@ #include #include #include +#include using vcpkg::PortFileProvider::PathsPortFileProvider; diff --git a/toolsrc/src/vcpkg/commands.setinstalled.cpp b/toolsrc/src/vcpkg/commands.setinstalled.cpp index 6ef5099dc6f5ef..cf366e4d058dcf 100644 --- a/toolsrc/src/vcpkg/commands.setinstalled.cpp +++ b/toolsrc/src/vcpkg/commands.setinstalled.cpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace vcpkg::Commands::SetInstalled { diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index 391192038a9f27..3e416c13e1090e 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace vcpkg::Commands::Upgrade { diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index 5fc77c738393e6..21258ee06ac9d3 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #define STRINGIFY(...) #__VA_ARGS__ #define MACRO_TO_STRING(X) STRINGIFY(X) diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp index bdc817c9c8b7cd..cc86bf89180850 100644 --- a/toolsrc/src/vcpkg/commands.xvsinstances.cpp +++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace vcpkg::Commands::X_VSInstances { From 70ce5b6bcb35bb0319a684bc16ba19f050eedad5 Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Mon, 17 Aug 2020 09:23:52 -0700 Subject: [PATCH 3/5] fix some things/format --- toolsrc/include/vcpkg/commands.h | 4 ---- toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index 2b8aa5220af2b3..b19801a0c272ed 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -6,10 +6,6 @@ namespace vcpkg::Commands { - struct BasicCommand; - struct PathsCommand; - struct TripletCommand; - template struct PackageNameAndFunction { diff --git a/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h index e323447e650f03..87d6f9eaa8e196 100644 --- a/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h @@ -2,12 +2,12 @@ namespace vcpkg { - struct ParsedArguments; - struct CommandSwitch; - struct CommandSetting; - struct CommandMultiSetting; - struct CommandOptionsStructure; - struct CommandStructure; + struct ParsedArguments; + struct CommandSwitch; + struct CommandSetting; + struct CommandMultiSetting; + struct CommandOptionsStructure; + struct CommandStructure; struct HelpTableFormatter; struct VcpkgCmdArguments; } From 78e7530b3fde7f27a0035b44009362d2913c1fa0 Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 19 Aug 2020 10:06:19 -0700 Subject: [PATCH 4/5] Util::unused -> void --- toolsrc/.clang-format | 4 +-- .../include/vcpkg-test/mockcmakevarprovider.h | 2 +- toolsrc/include/vcpkg/base/util.h | 11 ------- toolsrc/include/vcpkg/fwd/registries.h | 6 ++++ toolsrc/include/vcpkg/registries.h | 32 +++++++++++++++++++ toolsrc/src/vcpkg-test/util.cpp | 4 +-- toolsrc/src/vcpkg/base/files.cpp | 2 +- toolsrc/src/vcpkg/base/system.print.cpp | 2 +- toolsrc/src/vcpkg/build.cpp | 4 +-- toolsrc/src/vcpkg/commands.cache.cpp | 2 +- toolsrc/src/vcpkg/commands.create.cpp | 2 +- toolsrc/src/vcpkg/commands.fetch.cpp | 2 +- toolsrc/src/vcpkg/commands.hash.cpp | 2 +- toolsrc/src/vcpkg/commands.integrate.cpp | 2 +- toolsrc/src/vcpkg/commands.owns.cpp | 2 +- toolsrc/src/vcpkg/commands.porthistory.cpp | 2 +- toolsrc/src/vcpkg/commands.portsdiff.cpp | 2 +- toolsrc/src/vcpkg/commands.version.cpp | 2 +- toolsrc/src/vcpkg/dependencies.cpp | 4 ++- toolsrc/src/vcpkg/help.cpp | 2 +- toolsrc/src/vcpkg/metrics.cpp | 2 +- toolsrc/src/vcpkg/postbuildlint.cpp | 2 +- toolsrc/src/vcpkg/tools.cpp | 10 +++--- toolsrc/src/vcpkg/update.cpp | 2 +- 24 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 toolsrc/include/vcpkg/fwd/registries.h create mode 100644 toolsrc/include/vcpkg/registries.h diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format index ea9cb97ee1ae18..cdaabb8c11b400 100644 --- a/toolsrc/.clang-format +++ b/toolsrc/.clang-format @@ -40,9 +40,9 @@ IncludeCategories: Priority: -1 - Regex: '^$' Priority: 1 - - Regex: '^$' - Priority: 2 - Regex: '^$' + Priority: 2 + - Regex: '^$' Priority: 3 - Regex: '^$' Priority: 4 diff --git a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h index 482f9ea400dcb9..15b24b8d05027c 100644 --- a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h +++ b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h @@ -19,7 +19,7 @@ namespace vcpkg::Test { for (auto&& spec : specs) tag_vars[spec.package_spec] = {}; - Util::unused(port_provider); + (void)(port_provider); } Optional&> get_generic_triplet_vars( diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h index a6d8781b057239..11807b249dfb5d 100644 --- a/toolsrc/include/vcpkg/base/util.h +++ b/toolsrc/include/vcpkg/base/util.h @@ -239,15 +239,4 @@ namespace vcpkg::Util return e == E::YES; } } - - template - void unused(const Ts&...) - { - } - - template - T copy(const T& t) - { - return t; - } } diff --git a/toolsrc/include/vcpkg/fwd/registries.h b/toolsrc/include/vcpkg/fwd/registries.h new file mode 100644 index 00000000000000..1091a81ad2faa7 --- /dev/null +++ b/toolsrc/include/vcpkg/fwd/registries.h @@ -0,0 +1,6 @@ +#pragma once + +namespace vcpkg +{ + struct Registry; +} diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h new file mode 100644 index 00000000000000..17ea5611920d4c --- /dev/null +++ b/toolsrc/include/vcpkg/registries.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include + +namespace vcpkg +{ + struct RegistryImpl + { + virtual void update(std::error_code&) = 0; + virtual Optional find_port(StringView name) const = 0; + + virtual ~RegistryImpl() = default; + }; + + struct Registry + { + std::string name; + std::vector packages; + + std::unique_ptr underlying; + }; + +} diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp index 2841aefa035571..a2b9317a246ff4 100644 --- a/toolsrc/src/vcpkg-test/util.cpp +++ b/toolsrc/src/vcpkg-test/util.cpp @@ -195,7 +195,7 @@ namespace vcpkg::Test ec.assign(errno, std::system_category()); } #else - Util::unused(target, file, ec); + (void)(target, file, ec); vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message); #endif } @@ -217,7 +217,7 @@ namespace vcpkg::Test #elif FILESYSTEM_SYMLINK == FILESYSTEM_SYMLINK_UNIX ::vcpkg::Test::create_symlink(target, file, ec); #else - Util::unused(target, file, ec); + (void)(target, file, ec); vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message); #endif } diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index e4c821eaeaa294..0eb53db6087e17 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -574,7 +574,7 @@ namespace vcpkg::Files std::error_code& ec) override { this->rename(oldpath, newpath, ec); - Util::unused(temp_suffix); + (void)(temp_suffix); #if !defined(_WIN32) if (ec) { diff --git a/toolsrc/src/vcpkg/base/system.print.cpp b/toolsrc/src/vcpkg/base/system.print.cpp index 885269eef7038b..7366a810f403e7 100644 --- a/toolsrc/src/vcpkg/base/system.print.cpp +++ b/toolsrc/src/vcpkg/base/system.print.cpp @@ -22,7 +22,7 @@ namespace vcpkg::System #else // TODO: add color handling code // it should probably use VT-220 codes - Util::unused(c); + (void)(c); System::print2(message); #endif } diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 92dedd8dba16e0..ff5afc33d3eddf 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -470,7 +470,7 @@ namespace vcpkg::Build #if !defined(_WIN32) // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107. // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted. - vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA)); + (void)(paths.get_tool_exe(Tools::NINJA)); #endif std::vector cmake_args{ {"CURRENT_PORT_DIR", paths.scripts / "detect_compiler"}, @@ -536,7 +536,7 @@ namespace vcpkg::Build #if !defined(_WIN32) // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107. // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted. - vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA)); + (void)(paths.get_tool_exe(Tools::NINJA)); #endif auto& scfl = action.source_control_file_location.value_or_exit(VCPKG_LINE_INFO); auto& scf = *scfl.source_control_file; diff --git a/toolsrc/src/vcpkg/commands.cache.cpp b/toolsrc/src/vcpkg/commands.cache.cpp index 164d2769f16c26..3014f87a1eaa35 100644 --- a/toolsrc/src/vcpkg/commands.cache.cpp +++ b/toolsrc/src/vcpkg/commands.cache.cpp @@ -37,7 +37,7 @@ namespace vcpkg::Commands::Cache void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const std::vector binary_paragraphs = read_all_binary_paragraphs(paths); if (binary_paragraphs.empty()) diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 5ca72379c8d885..d590144eec2c2d 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -20,7 +20,7 @@ namespace vcpkg::Commands::Create int perform(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const std::string port_name = args.command_arguments.at(0); const std::string url = args.command_arguments.at(1); diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index 5e7182cd483d7a..2f1316c8cba355 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -17,7 +17,7 @@ namespace vcpkg::Commands::Fetch void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const std::string tool = args.command_arguments[0]; const fs::path tool_path = paths.get_tool_exe(tool); diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 4eb17b80a46357..0f6f8f56331481 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -19,7 +19,7 @@ namespace vcpkg::Commands::Hash void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const fs::path file_to_hash = args.command_arguments[0]; diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 0b8b39ffc4b57c..dc11599cd0eca0 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -532,7 +532,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); if (args.command_arguments[0] == Subcommand::INSTALL) { diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp index 1a2e88ed57bf35..f73dcfbadd186a 100644 --- a/toolsrc/src/vcpkg/commands.owns.cpp +++ b/toolsrc/src/vcpkg/commands.owns.cpp @@ -33,7 +33,7 @@ namespace vcpkg::Commands::Owns void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const StatusParagraphs status_db = database_load_check(paths); search_file(paths, args.command_arguments[0], status_db); diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 5b3f8985a17c72..fbbe281d19928e 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -84,7 +84,7 @@ namespace vcpkg::Commands::PortHistory void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); std::string port_name = args.command_arguments.at(0); std::vector versions = read_versions_from_log(paths, port_name); diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index 348944d42b5494..e5db501cd7a603 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -133,7 +133,7 @@ namespace vcpkg::Commands::PortsDiff void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index 21258ee06ac9d3..5e168bcdf020eb 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -84,7 +84,7 @@ namespace vcpkg::Commands::Version void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem&) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); System::print2("Vcpkg package management program version ", version(), diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index f7671ceef20789..2929df18b066cd 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -963,7 +963,9 @@ namespace vcpkg::Dependencies else if (p_cluster->request_type == RequestType::USER_REQUESTED && p_cluster->m_installed.has_value()) { auto&& installed = p_cluster->m_installed.value_or_exit(VCPKG_LINE_INFO); - plan.already_installed.emplace_back(Util::copy(installed.ipv), p_cluster->request_type); + plan.already_installed.emplace_back( + InstalledPackageView(installed.ipv), + p_cluster->request_type); } } diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp index 1719e5f6cce2ae..bb6947390c66e9 100644 --- a/toolsrc/src/vcpkg/help.cpp +++ b/toolsrc/src/vcpkg/help.cpp @@ -109,7 +109,7 @@ namespace vcpkg::Help void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); if (args.command_arguments.empty()) { diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 79a33a0d7421c9..ad72934fc67742 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -381,7 +381,7 @@ namespace vcpkg::Metrics } #if !defined(_WIN32) - Util::unused(payload); + (void)(payload); #else HINTERNET connect = nullptr, request = nullptr; BOOL results = FALSE; diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index a384cea0a9450c..0e4eb7bc0575e4 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -556,7 +556,7 @@ namespace vcpkg::PostBuildLint return LintStatus::ERROR_DETECTED; } #endif - Util::unused(expected_architecture, files); + (void)expected_architecture, (void)files; return LintStatus::SUCCESS; } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 1d5a682c6c8f6a..ac2fa953a161d2 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -138,7 +138,7 @@ namespace vcpkg virtual void add_special_paths(std::vector& out_candidate_paths) const { - Util::unused(out_candidate_paths); + (void)(out_candidate_paths); } virtual Optional get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const = 0; }; @@ -283,7 +283,7 @@ namespace vcpkg out_candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); #else // TODO: figure out if this should do anything on non-Windows - Util::unused(out_candidate_paths); + (void)(out_candidate_paths); #endif } virtual Optional get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override @@ -342,7 +342,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #else - Util::unused(paths); + (void)(paths); #endif cmd.path_arg(path_to_exe); const auto rc = System::cmd_execute_and_capture_output(cmd.extract()); @@ -380,7 +380,7 @@ Type 'NuGet help ' for help on a specific command. out_candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); #else // TODO: figure out if this should do anything on non-windows - Util::unused(out_candidate_paths); + (void)(out_candidate_paths); #endif } @@ -441,7 +441,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual void add_special_paths(std::vector& out_candidate_paths) const override { - Util::unused(out_candidate_paths); + (void)(out_candidate_paths); // TODO: Uncomment later // const std::vector from_path = Files::find_from_PATH("installerbase"); // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); diff --git a/toolsrc/src/vcpkg/update.cpp b/toolsrc/src/vcpkg/update.cpp index 48471e26c399c4..655c373682946d 100644 --- a/toolsrc/src/vcpkg/update.cpp +++ b/toolsrc/src/vcpkg/update.cpp @@ -53,7 +53,7 @@ namespace vcpkg::Update void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); + (void)(args.parse_arguments(COMMAND_STRUCTURE)); System::print2("Using local portfile versions. To update the local portfiles, use `git pull`.\n"); const StatusParagraphs status_db = database_load_check(paths); From 26ee6dd809f9c337ba0f51103d170863f80aa751 Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 19 Aug 2020 10:17:49 -0700 Subject: [PATCH 5/5] fix formatting, and also format --- toolsrc/CMakeLists.txt | 4 ++-- toolsrc/include/vcpkg/archives.h | 4 ++-- toolsrc/include/vcpkg/buildenvironment.h | 4 ++-- toolsrc/include/vcpkg/cmakevars.h | 4 ++-- toolsrc/include/vcpkg/commands.h | 3 +-- toolsrc/include/vcpkg/commands.interface.h | 6 +++--- toolsrc/include/vcpkg/export.ifw.h | 4 ++-- toolsrc/include/vcpkg/statusparagraph.h | 4 ++-- toolsrc/include/vcpkg/tools.h | 4 ++-- toolsrc/include/vcpkg/vcpkgcmdarguments.h | 6 +++--- toolsrc/include/vcpkg/vcpkgpaths.h | 4 ++-- toolsrc/src/vcpkg/commands.autocomplete.cpp | 2 +- toolsrc/src/vcpkg/commands.ci.cpp | 2 +- toolsrc/src/vcpkg/commands.ciclean.cpp | 1 - toolsrc/src/vcpkg/commands.create.cpp | 2 +- toolsrc/src/vcpkg/commands.fetch.cpp | 1 - toolsrc/src/vcpkg/commands.hash.cpp | 1 - toolsrc/src/vcpkg/commands.info.cpp | 2 +- toolsrc/src/vcpkg/commands.integrate.cpp | 2 +- toolsrc/src/vcpkg/commands.list.cpp | 2 +- toolsrc/src/vcpkg/commands.owns.cpp | 2 +- toolsrc/src/vcpkg/commands.porthistory.cpp | 2 +- toolsrc/src/vcpkg/commands.portsdiff.cpp | 2 +- toolsrc/src/vcpkg/commands.search.cpp | 2 +- toolsrc/src/vcpkg/commands.setinstalled.cpp | 2 +- toolsrc/src/vcpkg/commands.upgrade.cpp | 2 +- toolsrc/src/vcpkg/commands.version.cpp | 2 +- toolsrc/src/vcpkg/commands.xvsinstances.cpp | 2 +- toolsrc/src/vcpkg/dependencies.cpp | 4 +--- 29 files changed, 38 insertions(+), 44 deletions(-) diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 62cb3740db265f..8b525c248a3fbe 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -157,10 +157,10 @@ if(CLANG_FORMAT) add_custom_target(format COMMAND ${CLANG_FORMAT} -i -verbose ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp ${VCPKGLIB_BASE_SOURCES} - ${VCPKGLIB_NON_PCH_SOURCES} + ${VCPKGLIB_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h ${VCPKGLIB_BASE_INCLUDES} - ${VCPKGLIB_NON_PCH_INCLUDES} + ${VCPKGLIB_INCLUDES} ${VCPKG_SOURCES} ${VCPKGMETRICSUPLOADER_SOURCES} diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h index addb2d5a6e4cb8..be2523dfb980cd 100644 --- a/toolsrc/include/vcpkg/archives.h +++ b/toolsrc/include/vcpkg/archives.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + namespace vcpkg::Archives { void extract_archive(const VcpkgPaths& paths, const fs::path& archive, const fs::path& to_path); diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h index 6757e5a91e8720..aa69708b670746 100644 --- a/toolsrc/include/vcpkg/buildenvironment.h +++ b/toolsrc/include/vcpkg/buildenvironment.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + #include #include diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h index 9e23aefb6db556..66dd287b858206 100644 --- a/toolsrc/include/vcpkg/cmakevars.h +++ b/toolsrc/include/vcpkg/cmakevars.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + #include namespace vcpkg::Dependencies diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index b19801a0c272ed..77e4782196e5b7 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -1,8 +1,7 @@ #pragma once -#include - #include +#include namespace vcpkg::Commands { diff --git a/toolsrc/include/vcpkg/commands.interface.h b/toolsrc/include/vcpkg/commands.interface.h index 7e31dc52d2e9f7..c8bc14ca967993 100644 --- a/toolsrc/include/vcpkg/commands.interface.h +++ b/toolsrc/include/vcpkg/commands.interface.h @@ -1,11 +1,11 @@ #pragma once -#include +#include +#include #include -#include -#include +#include namespace vcpkg::Commands { diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h index 02dd348d8b5782..0fe07227c26002 100644 --- a/toolsrc/include/vcpkg/export.ifw.h +++ b/toolsrc/include/vcpkg/export.ifw.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + #include #include diff --git a/toolsrc/include/vcpkg/statusparagraph.h b/toolsrc/include/vcpkg/statusparagraph.h index 71aafbaa6dfeed..1cfa7a17c5b0fd 100644 --- a/toolsrc/include/vcpkg/statusparagraph.h +++ b/toolsrc/include/vcpkg/statusparagraph.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + #include namespace vcpkg diff --git a/toolsrc/include/vcpkg/tools.h b/toolsrc/include/vcpkg/tools.h index b5b61277a66703..f9618a52dcbdcd 100644 --- a/toolsrc/include/vcpkg/tools.h +++ b/toolsrc/include/vcpkg/tools.h @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + #include #include diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index aa1f0c470f3e44..3e956c83e5048a 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -1,13 +1,13 @@ #pragma once +#include +#include + #include #include #include #include -#include -#include - #include #include #include diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 7de1b3ef8e1d71..2262543d9f4ef5 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include #include @@ -7,8 +9,6 @@ #include #include -#include - namespace vcpkg { struct ToolsetArchOption diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index a8f54389c73210..84a1f5ed5301c8 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::Autocomplete { diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 18cfee5eebe8c7..e9577e4adfc06d 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -15,8 +15,8 @@ #include #include #include -#include #include +#include using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/commands.ciclean.cpp b/toolsrc/src/vcpkg/commands.ciclean.cpp index 3a41de3aa01975..9d3b396400e026 100644 --- a/toolsrc/src/vcpkg/commands.ciclean.cpp +++ b/toolsrc/src/vcpkg/commands.ciclean.cpp @@ -5,7 +5,6 @@ #include #include #include -#include using namespace vcpkg; diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index d590144eec2c2d..3dba465afff6d6 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::Create { diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index 2f1316c8cba355..4942013c39508a 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -3,7 +3,6 @@ #include #include #include -#include namespace vcpkg::Commands::Fetch { diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 0f6f8f56331481..3b93b09bdbd0d5 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -5,7 +5,6 @@ #include #include #include -#include namespace vcpkg::Commands::Hash { diff --git a/toolsrc/src/vcpkg/commands.info.cpp b/toolsrc/src/vcpkg/commands.info.cpp index 548015ba9a627a..71db6a8f4dad47 100644 --- a/toolsrc/src/vcpkg/commands.info.cpp +++ b/toolsrc/src/vcpkg/commands.info.cpp @@ -9,9 +9,9 @@ #include #include #include +#include #include #include -#include namespace vcpkg::Commands::Info { diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index dc11599cd0eca0..0b635d9c3573b6 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -9,8 +9,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::Integrate { diff --git a/toolsrc/src/vcpkg/commands.list.cpp b/toolsrc/src/vcpkg/commands.list.cpp index 4b291ca55eeaa6..2156857d169117 100644 --- a/toolsrc/src/vcpkg/commands.list.cpp +++ b/toolsrc/src/vcpkg/commands.list.cpp @@ -2,9 +2,9 @@ #include #include +#include #include #include -#include namespace vcpkg::Commands::List { diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp index f73dcfbadd186a..bb5e19715250b3 100644 --- a/toolsrc/src/vcpkg/commands.owns.cpp +++ b/toolsrc/src/vcpkg/commands.owns.cpp @@ -2,8 +2,8 @@ #include #include -#include #include +#include namespace vcpkg::Commands::Owns { diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index fbbe281d19928e..e5e99cb416f8ac 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::PortHistory { diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index e5db501cd7a603..a613b4be6582b9 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::PortsDiff { diff --git a/toolsrc/src/vcpkg/commands.search.cpp b/toolsrc/src/vcpkg/commands.search.cpp index 80988e9eb1068d..4a1defadd40ab1 100644 --- a/toolsrc/src/vcpkg/commands.search.cpp +++ b/toolsrc/src/vcpkg/commands.search.cpp @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include using vcpkg::PortFileProvider::PathsPortFileProvider; diff --git a/toolsrc/src/vcpkg/commands.setinstalled.cpp b/toolsrc/src/vcpkg/commands.setinstalled.cpp index cf366e4d058dcf..5d1599f1f680d5 100644 --- a/toolsrc/src/vcpkg/commands.setinstalled.cpp +++ b/toolsrc/src/vcpkg/commands.setinstalled.cpp @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::SetInstalled { diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index 3e416c13e1090e..dd42d76c498c7e 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include namespace vcpkg::Commands::Upgrade { diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index 5e168bcdf020eb..50ffc7c780c3e1 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -3,8 +3,8 @@ #include #include #include -#include #include +#include #define STRINGIFY(...) #__VA_ARGS__ #define MACRO_TO_STRING(X) STRINGIFY(X) diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp index cc86bf89180850..91bd1b94337a1e 100644 --- a/toolsrc/src/vcpkg/commands.xvsinstances.cpp +++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp @@ -2,8 +2,8 @@ #include #include -#include #include +#include namespace vcpkg::Commands::X_VSInstances { diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 2929df18b066cd..a8f3b57491645f 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -963,9 +963,7 @@ namespace vcpkg::Dependencies else if (p_cluster->request_type == RequestType::USER_REQUESTED && p_cluster->m_installed.has_value()) { auto&& installed = p_cluster->m_installed.value_or_exit(VCPKG_LINE_INFO); - plan.already_installed.emplace_back( - InstalledPackageView(installed.ipv), - p_cluster->request_type); + plan.already_installed.emplace_back(InstalledPackageView(installed.ipv), p_cluster->request_type); } }