Skip to content

Commit bb422f5

Browse files
TheShermanTankerAlexey Semenyuk
authored andcommitted
8293595: tstrings::any() is missing an overload
Reviewed-by: asemenyuk, almatvee
1 parent 0f28cb0 commit bb422f5

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/jdk.jpackage/share/native/common/tstrings.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,11 @@ namespace tstrings {
356356
data << fromUtf8(msg);
357357
}
358358

359+
any& operator << (const std::string& msg) {
360+
data << fromUtf8(msg);
361+
return *this;
362+
}
363+
359364
#ifdef TSTRINGS_WITH_WCHAR
360365
any(std::wstring::const_pointer msg) {
361366
data << msg;
@@ -365,22 +370,22 @@ namespace tstrings {
365370
data << msg;
366371
}
367372

368-
any& operator << (const std::wstring& v) {
369-
data << v;
373+
any& operator << (const std::wstring& msg) {
374+
data << msg;
370375
return *this;
371376
}
372377

373378
// need this specialization instead std::wstring::pointer,
374379
// otherwise LPWSTR is handled as abstract pointer (void*)
375-
any& operator << (LPWSTR v) {
376-
data << (v ? v : L"NULL");
380+
any& operator << (LPWSTR msg) {
381+
data << (msg ? msg : L"NULL");
377382
return *this;
378383
}
379384

380385
// need this specialization instead std::wstring::const_pointer,
381386
// otherwise LPCWSTR is handled as abstract pointer (const void*)
382-
any& operator << (LPCWSTR v) {
383-
data << (v ? v : L"NULL");
387+
any& operator << (LPCWSTR msg) {
388+
data << (msg ? msg : L"NULL");
384389
return *this;
385390
}
386391

0 commit comments

Comments
 (0)