maint: Merge stable to default.

gnu-octave · Jan 18, 2024 · 2aef8f3 · 2aef8f3
2 parents 1c0c893 + f98ef8d
commit 2aef8f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
@@ -612,7 +612,7 @@ jobs:
       - 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 --git a/libinterp/corefcn/oct-stream.h b/libinterp/corefcn/oct-stream.h
@@ -127,10 +127,14 @@ class OCTINTERP_API base_stream
     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 ());