diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h index 62e77e9e7..f2e9c474b 100644 --- a/toolsrc/include/vcpkg_Checks.h +++ b/toolsrc/include/vcpkg_Checks.h @@ -25,7 +25,7 @@ namespace vcpkg::Checks template _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, errorMessageArg1, errorMessageArgs...).c_str()); + exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...)); } _declspec(noreturn) void throw_with_message(const LineInfo& line_info, const cstring_view errorMessage); @@ -33,7 +33,7 @@ namespace vcpkg::Checks template _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, errorMessageArg1, errorMessageArgs...).c_str()); + throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...)); } void check_throw(const LineInfo& line_info, bool expression, const cstring_view errorMessage); @@ -44,7 +44,7 @@ namespace vcpkg::Checks if (!expression) { // Only create the string if the expression is false - throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str()); + throw_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...)); } } @@ -58,7 +58,7 @@ namespace vcpkg::Checks if (!expression) { // Only create the string if the expression is false - exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...).c_str()); + exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...)); } } } diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h index 1e2ecd9a4..1c4570134 100644 --- a/toolsrc/include/vcpkg_System.h +++ b/toolsrc/include/vcpkg_System.h @@ -38,25 +38,25 @@ namespace vcpkg::System template void print(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs) { - return print(Strings::format(messageTemplate, messageArg1, messageArgs...).c_str()); + return print(Strings::format(messageTemplate, messageArg1, messageArgs...)); } template void print(const color c, const Arg1& messageArg1, const char* messageTemplate, const Args&... messageArgs) { - return print(c, Strings::format(messageTemplate, messageArg1, messageArgs...).c_str()); + return print(c, Strings::format(messageTemplate, messageArg1, messageArgs...)); } template void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs) { - return println(Strings::format(messageTemplate, messageArg1, messageArgs...).c_str()); + return println(Strings::format(messageTemplate, messageArg1, messageArgs...)); } template void println(const color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs) { - return println(c, Strings::format(messageTemplate, messageArg1, messageArgs...).c_str()); + return println(c, Strings::format(messageTemplate, messageArg1, messageArgs...)); } optional get_environmental_variable(const cwstring_view varname) noexcept;