Merge branch 'master' into master

1 files changed, 28 insertions, 9 deletions

diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
index c420464c1..c9195163c 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg_System.h
@@ -1,12 +1,11 @@
 #pragma once
 
 #include "vcpkg_Strings.h"
+#include "filesystem_fs.h"
 
-#include <filesystem>
-
-namespace vcpkg {namespace System
+namespace vcpkg::System
 {
-    std::tr2::sys::path get_exe_path_of_current_process();
+    fs::path get_exe_path_of_current_process();
 
     struct exit_code_and_output
     {
@@ -37,8 +36,28 @@ namespace vcpkg {namespace System
 
     void print(const char* message);
     void println(const char* message);
-    void print(color c, const char* message);
-    void println(color c, const char* message);
+    void print(const color c, const char* message);
+    void println(const color c, const char* message);
+
+    inline void print(const std::string& message)
+    {
+        return print(message.c_str());
+    }
+
+    inline void println(const std::string& message)
+    {
+        return println(message.c_str());
+    }
+
+    inline void print(const color c, const std::string& message)
+    {
+        return print(c, message.c_str());
+    }
+
+    inline void println(const color c, const std::string& message)
+    {
+        return println(c, message.c_str());
+    }
 
     template <class...Args>
     void print(const char* messageTemplate, const Args&... messageArgs)
@@ -47,7 +66,7 @@ namespace vcpkg {namespace System
     }
 
     template <class...Args>
-    void print(color c, const char* messageTemplate, const Args&... messageArgs)
+    void print(const color c, const char* messageTemplate, const Args&... messageArgs)
     {
         return print(c, Strings::format(messageTemplate, messageArgs...).c_str());
     }
@@ -59,7 +78,7 @@ namespace vcpkg {namespace System
     }
 
     template <class...Args>
-    void println(color c, const char* messageTemplate, const Args&... messageArgs)
+    void println(const color c, const char* messageTemplate, const Args&... messageArgs)
     {
         return println(c, Strings::format(messageTemplate, messageArgs...).c_str());
     }
@@ -74,4 +93,4 @@ namespace vcpkg {namespace System
     };
 
     std::wstring wdupenv_str(const wchar_t* varname) noexcept;
-}}
+}