Update ci.yml

.github/workflows/ci.yml

@@ -19,41 +19,44 @@ jobs:
         include:
           - toolset: gcc-4.8
             cxxstd: "11"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: g++-4.8-multilib
             address-model: 32,64
           - toolset: gcc-5
             cxxstd: "11,14,1z"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: g++-5-multilib
             address-model: 32,64
           - toolset: gcc-6
             cxxstd: "11,14,1z"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: g++-6-multilib
             address-model: 32,64
           - toolset: gcc-7
             cxxstd: "11,14,17"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: g++-7-multilib
             address-model: 32,64
           - toolset: gcc-8
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: g++-8-multilib
             address-model: 32,64
           - toolset: gcc-9
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: g++-9-multilib
             address-model: 32,64
           - toolset: gcc-10
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: g++-10-multilib
             address-model: 32,64
           - toolset: gcc-11
@@ -73,61 +76,77 @@ jobs:
             install: g++-13-multilib
             address-model: 32,64
           - toolset: gcc-14
-            cxxstd: "11,14,17,20,2b"
+            cxxstd: "11,14,17,20,23,2c"
             os: ubuntu-latest
             container: ubuntu:24.04
             install: g++-14-multilib
             address-model: 32,64
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,2c"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install: g++-15-multilib
+            address-model: 32,64
           - toolset: clang
             compiler: clang++-3.9
             cxxstd: "11,14"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: clang-3.9
           - toolset: clang
             compiler: clang++-4.0
             cxxstd: "11,14"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: clang-4.0
           - toolset: clang
             compiler: clang++-5.0
             cxxstd: "11,14,1z"
-            os: ubuntu-latest
             container: ubuntu:18.04
+            os: ubuntu-latest
             install: clang-5.0
           - toolset: clang
             compiler: clang++-6.0
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: clang-6.0
           - toolset: clang
             compiler: clang++-7
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: clang-7
           - toolset: clang
             compiler: clang++-8
             cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: clang-8
           - toolset: clang
             compiler: clang++-9
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
             install: clang-9
           - toolset: clang
             compiler: clang++-10
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-10
           - toolset: clang
             compiler: clang++-11
             cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-11
           - toolset: clang
             compiler: clang++-12
             cxxstd: "11,14,17,20"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-12
           - toolset: clang
             compiler: clang++-13
             cxxstd: "11,14,17,20,2b"
@@ -166,10 +185,16 @@ jobs:
             install: clang-18
           - toolset: clang
             compiler: clang++-19
-            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:24.10
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:24.04
             os: ubuntu-latest
             install: clang-19
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:25.04
+            os: ubuntu-latest
+            install: clang-20
           - toolset: clang
             cxxstd: "11,14,17,20,2b"
             os: macos-13
@@ -310,7 +335,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
           - os: ubuntu-22.04
           - os: ubuntu-24.04
           - os: macos-13
@@ -359,7 +383,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
           - os: ubuntu-22.04
           - os: ubuntu-24.04
           - os: macos-13
@@ -418,7 +441,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
           - os: ubuntu-22.04
           - os: ubuntu-24.04
           - os: macos-13

doc/smart_ptr/changelog.adoc

@@ -1,5 +1,5 @@
 ////
-Copyright 2019, 2020 Peter Dimov
+Copyright 2019-2025 Peter Dimov
 
 Distributed under the Boost Software License, Version 1.0.
 
@@ -13,6 +13,10 @@ http://www.boost.org/LICENSE_1_0.txt
 :toc-title:
 :idprefix: changelog_
 
+## Changes in 1.88.0
+
+* Fix `operator<<` for wide streams (accidentally broken in 1.87.0)
+
 ## Changes in 1.87.0
 
 * {cpp}03 is no longer supported, a {cpp}11 compiler is required.

include/boost/smart_ptr/intrusive_ptr.hpp

@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<
 
 // operator<<
 
-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
 {
     os << p.get();
     return os;

include/boost/smart_ptr/shared_ptr.hpp

@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar
 
 // operator<<
 
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
 {
     os << p.get();
     return os;

test/Jamfile

@@ -424,3 +424,7 @@ run sp_is_bounded_array_test.cpp ;
 run sp_is_unbounded_array_test.cpp ;
 run sp_type_identity_test.cpp ;
 run sp_type_with_alignment_test.cpp ;
+
+run sp_ostream_test.cpp ;
+run ip_ostream_test.cpp ;
+run lsp_ostream_test.cpp ;

test/ip_ostream_test.cpp

@@ -0,0 +1,75 @@
+// Copyright 2011, 2025 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <sstream>
+
+class base
+{
+private:
+
+    int use_count_;
+
+    base(base const &);
+    base & operator=(base const &);
+
+protected:
+
+    base(): use_count_(0)
+    {
+    }
+
+    virtual ~base()
+    {
+    }
+
+public:
+
+    long use_count() const
+    {
+        return use_count_;
+    }
+
+    inline friend void intrusive_ptr_add_ref(base * p)
+    {
+        ++p->use_count_;
+    }
+
+    inline friend void intrusive_ptr_release(base * p)
+    {
+        if(--p->use_count_ == 0) delete p;
+    }
+};
+
+struct X: public base
+{
+};
+
+template<class T> std::string to_string( T const& t )
+{
+    std::ostringstream os;
+    os << t;
+    return os.str();
+}
+
+template<class T> std::wstring to_wstring( T const& t )
+{
+    std::wostringstream os;
+    os << t;
+    return os.str();
+}
+
+int main()
+{
+    boost::intrusive_ptr<X> p1, p2( new X );
+
+    BOOST_TEST_EQ( to_string( p1 ), to_string( p1.get() ) );
+    BOOST_TEST_EQ( to_string( p2 ), to_string( p2.get() ) );
+
+    BOOST_TEST( to_wstring( p1 ) == to_wstring( p1.get() ) );
+    BOOST_TEST( to_wstring( p2 ) == to_wstring( p2.get() ) );
+
+    return boost::report_errors();
+}

test/lsp_ostream_test.cpp

@@ -0,0 +1,34 @@
+// Copyright 2025 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/smart_ptr/local_shared_ptr.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <sstream>
+
+template<class T> std::string to_string( T const& t )
+{
+    std::ostringstream os;
+    os << t;
+    return os.str();
+}
+
+template<class T> std::wstring to_wstring( T const& t )
+{
+    std::wostringstream os;
+    os << t;
+    return os.str();
+}
+
+int main()
+{
+    boost::local_shared_ptr<int> p1, p2( new int );
+
+    BOOST_TEST_EQ( to_string( p1 ), to_string( p1.get() ) );
+    BOOST_TEST_EQ( to_string( p2 ), to_string( p2.get() ) );
+
+    BOOST_TEST( to_wstring( p1 ) == to_wstring( p1.get() ) );
+    BOOST_TEST( to_wstring( p2 ) == to_wstring( p2.get() ) );
+
+    return boost::report_errors();
+}

test/sp_ostream_test.cpp

@@ -0,0 +1,34 @@
+// Copyright 2025 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/shared_ptr.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <sstream>
+
+template<class T> std::string to_string( T const& t )
+{
+    std::ostringstream os;
+    os << t;
+    return os.str();
+}
+
+template<class T> std::wstring to_wstring( T const& t )
+{
+    std::wostringstream os;
+    os << t;
+    return os.str();
+}
+
+int main()
+{
+    boost::shared_ptr<int> p1, p2( new int );
+
+    BOOST_TEST_EQ( to_string( p1 ), to_string( p1.get() ) );
+    BOOST_TEST_EQ( to_string( p2 ), to_string( p2.get() ) );
+
+    BOOST_TEST( to_wstring( p1 ) == to_wstring( p1.get() ) );
+    BOOST_TEST( to_wstring( p2 ) == to_wstring( p2.get() ) );
+
+    return boost::report_errors();
+}