diff --git a/src/jdk.jpackage/share/native/common/tstrings.h b/src/jdk.jpackage/share/native/common/tstrings.h index 73787ee4759c8..0a2ade012da2d 100644 --- a/src/jdk.jpackage/share/native/common/tstrings.h +++ b/src/jdk.jpackage/share/native/common/tstrings.h @@ -356,6 +356,11 @@ namespace tstrings { data << fromUtf8(msg); } + any& operator << (const std::string& msg) { + data << fromUtf8(msg); + return *this; + } + #ifdef TSTRINGS_WITH_WCHAR any(std::wstring::const_pointer msg) { data << msg; @@ -365,22 +370,22 @@ namespace tstrings { data << msg; } - any& operator << (const std::wstring& v) { - data << v; + any& operator << (const std::wstring& msg) { + data << msg; return *this; } // need this specialization instead std::wstring::pointer, // otherwise LPWSTR is handled as abstract pointer (void*) - any& operator << (LPWSTR v) { - data << (v ? v : L"NULL"); + any& operator << (LPWSTR msg) { + data << (msg ? msg : L"NULL"); return *this; } // need this specialization instead std::wstring::const_pointer, // otherwise LPCWSTR is handled as abstract pointer (const void*) - any& operator << (LPCWSTR v) { - data << (v ? v : L"NULL"); + any& operator << (LPCWSTR msg) { + data << (msg ? msg : L"NULL"); return *this; }