# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1705602552 -3600
# Node ID 8de10f0e1dedc2ddc7cc4c7d567f167afbb06133
# Parent  33e36b56656e72e30f024253b4b7ea7cecf301fa# Parent  0983439079bc429105944eed907535ea5e4c3f5b
maint: Merge stable to default.

diff -r 33e36b56656e -r 8de10f0e1ded .github/workflows/make.yaml
--- a/.github/workflows/make.yaml	Thu Jan 18 17:44:26 2024 +0100
+++ b/.github/workflows/make.yaml	Thu Jan 18 19:29:12 2024 +0100
@@ -612,7 +612,7 @@
       - name: test stand-alone executable
         run: |
           cd examples/code
-          PATH="/Users/runner/usr/bin:$PATH" CXX="${CXX} ${{ matrix.cxx-compiler-flags }}" \
+          PATH="/Users/runner/usr/bin:$PATH" CXX="${CXX} -std=gnu++11" \
             mkoctfile --link-stand-alone embedded.cc -o embedded
           ./embedded
 
diff -r 33e36b56656e -r 8de10f0e1ded libinterp/corefcn/oct-stream.h
--- a/libinterp/corefcn/oct-stream.h	Thu Jan 18 17:44:26 2024 +0100
+++ b/libinterp/corefcn/oct-stream.h	Thu Jan 18 19:29:12 2024 +0100
@@ -127,10 +127,14 @@
     std::ostream *os = output_stream ();
     if (os && *os)
       {
+        // FIXME: Using std::make_unique could simplify the following
+        //        expressions once we require C++14.
         m_converter
-          = std::make_unique<std::wbuffer_convert<convfacet_u8, char>>
-            (os->rdbuf (), new convfacet_u8 (m_encoding));
-        m_conv_ostream = std::make_unique<std::ostream> (m_converter.get ());
+          = std::unique_ptr<std::wbuffer_convert<convfacet_u8, char>>
+            (new std::wbuffer_convert<convfacet_u8, char>
+             (os->rdbuf (), new convfacet_u8 (m_encoding)));
+        m_conv_ostream = std::unique_ptr<std::ostream>
+                         (new std::ostream (m_converter.get ()));
       }
 
     return (m_conv_ostream ? m_conv_ostream.get () : output_stream ());