Mercurial > octave
changeset 32776:8de10f0e1ded
maint: Merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 18 Jan 2024 19:29:12 +0100 |
| parents | 33e36b56656e (current diff) 0983439079bc (diff) |
| children | 80f7aec2c1c6 dd46b69b0330 |
| files | .github/workflows/make.yaml libinterp/corefcn/oct-stream.h |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 ());