From 780ef97d1bc10c5433fa16789cbaf9b0c7cd4c99 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 28 Mar 2017 12:52:04 -0700
Subject: Use cstring_view in all functions in Checks::

---
 toolsrc/include/vcpkg_Checks.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h
index d75f25a6b..62e77e9e7 100644
--- a/toolsrc/include/vcpkg_Checks.h
+++ b/toolsrc/include/vcpkg_Checks.h
@@ -20,45 +20,45 @@ namespace vcpkg::Checks
     }
 
     // Part of the reason these exist is to not include extra headers in this one to avoid circular #includes. 
-    _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const char* errorMessage);
+    _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const cstring_view errorMessage);
 
-    template <class...Args>
-    _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Args&... errorMessageArgs)
+    template <class Arg1, class...Args>
+    _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
     {
-        exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArgs...).c_str());
+        exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str());
     }
 
-    _declspec(noreturn) void throw_with_message(const LineInfo& line_info, const char* errorMessage);
+    _declspec(noreturn) void throw_with_message(const LineInfo& line_info, const cstring_view errorMessage);
 
-    template <class...Args>
-    _declspec(noreturn) void throw_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Args&... errorMessageArgs)
+    template <class Arg1, class...Args>
+    _declspec(noreturn) void throw_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
     {
-        throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArgs...).c_str());
+        throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str());
     }
 
-    void check_throw(const LineInfo& line_info, bool expression, const char* errorMessage);
+    void check_throw(const LineInfo& line_info, bool expression, const cstring_view errorMessage);
 
-    template <class...Args>
-    void check_throw(const LineInfo& line_info, bool expression, const char* errorMessageTemplate, const Args&... errorMessageArgs)
+    template <class Arg1, class...Args>
+    void check_throw(const LineInfo& line_info, bool expression, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
     {
         if (!expression)
         {
             // Only create the string if the expression is false
-            throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArgs...).c_str());
+            throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str());
         }
     }
 
     void check_exit(const LineInfo& line_info, bool expression);
 
-    void check_exit(const LineInfo& line_info, bool expression, const char* errorMessage);
+    void check_exit(const LineInfo& line_info, bool expression, const cstring_view errorMessage);
 
-    template <class...Args>
-    void check_exit(const LineInfo& line_info, bool expression, const char* errorMessageTemplate, const Args&... errorMessageArgs)
+    template <class Arg1, class...Args>
+    void check_exit(const LineInfo& line_info, bool expression, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
     {
         if (!expression)
         {
             // Only create the string if the expression is false
-            exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArgs...).c_str());
+            exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str());
         }
     }
 }
-- 
cgit v1.2.3