From c84765601bbe49a6ec2e252ec681fe843212230f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 31 Mar 2017 17:24:45 -0700 Subject: Move Environment::get_program_files() to System::get_program_files() --- toolsrc/include/vcpkg_Environment.h | 4 ---- toolsrc/include/vcpkg_System.h | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Environment.h b/toolsrc/include/vcpkg_Environment.h index 5d12c8f6c..32ab28391 100644 --- a/toolsrc/include/vcpkg_Environment.h +++ b/toolsrc/include/vcpkg_Environment.h @@ -12,8 +12,4 @@ namespace vcpkg::Environment }; const vcvarsall_and_platform_toolset& get_vcvarsall_bat(const vcpkg_paths& paths); - - const fs::path& get_ProgramFiles_32_bit(); - - const fs::path& get_ProgramFiles_platform_bitness(); } diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h index 84fe43988..33aad646c 100644 --- a/toolsrc/include/vcpkg_System.h +++ b/toolsrc/include/vcpkg_System.h @@ -42,7 +42,7 @@ namespace vcpkg::System } template - void print(const color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs) + void print(const color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs) { return print(c, Strings::format(messageTemplate, messageArg1, messageArgs...)); } @@ -62,4 +62,8 @@ namespace vcpkg::System optional get_environmental_variable(const cwstring_view varname) noexcept; optional get_registry_string(HKEY base, const cwstring_view subkey, const cwstring_view valuename); + + const fs::path& get_ProgramFiles_32_bit(); + + const fs::path& get_ProgramFiles_platform_bitness(); } -- cgit v1.2.3