https://gcc.gnu.org/g:dfc9062eca47c237953c88a5614ae792792d058d

commit r15-5108-gdfc9062eca47c237953c88a5614ae792792d058d
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Nov 8 11:09:47 2024 +0000

    libstdc++: Improve exception messages in conversion classes
    
    The std::logic_error exceptions thrown from misuses of
    std::wbuffer_convert and std::wstring_convert should use names qualified
    with "std::".
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/locale_conv.h (wstring_convert, wbuffer_convert):
            Adjust strings passed to exception constructors.

Diff:
---
 libstdc++-v3/include/bits/locale_conv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/bits/locale_conv.h 
b/libstdc++-v3/include/bits/locale_conv.h
index 63dee1ac8727..fa328ee28949 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -289,7 +289,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
        * The object's conversion state will persist between conversions.
        */
       wstring_convert(_Codecvt* __pcvt, state_type __state)
-      : _M_cvt(__pcvt, "wstring_convert"),
+      : _M_cvt(__pcvt, "std::wstring_convert"),
        _M_state(__state), _M_with_cvtstate(true)
       { }
 
@@ -428,7 +428,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
       explicit
       wbuffer_convert(streambuf* __bytebuf, _Codecvt* __pcvt = new _Codecvt,
                      state_type __state = state_type())
-      : _M_buf(__bytebuf), _M_cvt(__pcvt, "wbuffer_convert"),
+      : _M_buf(__bytebuf), _M_cvt(__pcvt, "std::wbuffer_convert"),
        _M_state(__state), _M_always_noconv(_M_cvt->always_noconv())
       {
        if (_M_buf)

Reply via email to