The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-24 11:37:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded calls to c_str()

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-03-28 12:54:18 -07:00
parent 780ef97d1b
commit db4d1df5f0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolsrc/include/vcpkg_Checks.h
View File

@ -25,7 +25,7 @@ namespace vcpkg::Checks
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, 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 <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, 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...));
}
}
}

8
toolsrc/include/vcpkg_System.h
View File

@ -38,25 +38,25 @@ namespace vcpkg::System
template <class Arg1, class...Args>
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 <class Arg1, class...Args>
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 <class Arg1, class...Args>
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 <class Arg1, class...Args>
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<std::wstring> get_environmental_variable(const cwstring_view varname) noexcept;