diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-28 12:54:18 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-28 18:48:03 -0700 |
| commit | db4d1df5f0ecd476aae2869828b6060484133438 (patch) | |
| tree | 4dfef6a4cc0b28d8c8c37e995f0167315f668415 /toolsrc | |
| parent | 780ef97d1bc10c5433fa16789cbaf9b0c7cd4c99 (diff) | |
| download | vcpkg-db4d1df5f0ecd476aae2869828b6060484133438.tar.gz vcpkg-db4d1df5f0ecd476aae2869828b6060484133438.zip | |
Remove unneeded calls to c_str()
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Checks.h | 8 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_System.h | 8 |
2 files changed, 8 insertions, 8 deletions
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 <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...)); } } } 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 <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; |
