Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

nl_setup.cpp: Fix for some compilers not being CWG 1579 compliant (nw)

Browse Source
This commit is contained in:
AJR 2020-06-13 17:27:49 -04:00
parent 58f3c274f4
commit 0572ca886e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/netlist/nl_setup.cpp
View File

@ -15,6 +15,13 @@
#include "solver/nld_solver.h" #include "solver/nld_solver.h"
// Workaround for return value optimization failure in some older versions of clang
#if defined(__APPLE__) && defined(__clang__) && __clang_major__ < 8
#define MOVE_UNIQUE_PTR(x) (std::move(x))
#else
#define MOVE_UNIQUE_PTR(x) (x)
#endif
namespace netlist namespace netlist
{ {
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
@ -1597,7 +1604,7 @@ source_string_t::stream_ptr source_string_t::stream(const pstring &name)
plib::unused_var(name); plib::unused_var(name);
auto ret(std::make_unique<std::istringstream>(m_str)); auto ret(std::make_unique<std::istringstream>(m_str));
ret->imbue(std::locale::classic()); ret->imbue(std::locale::classic());
return ret; return MOVE_UNIQUE_PTR(ret);
} }
source_mem_t::stream_ptr source_mem_t::stream(const pstring &name) source_mem_t::stream_ptr source_mem_t::stream(const pstring &name)
@ -1605,7 +1612,7 @@ source_mem_t::stream_ptr source_mem_t::stream(const pstring &name)
plib::unused_var(name); plib::unused_var(name);
auto ret(std::make_unique<std::istringstream>(m_str, std::ios_base::binary)); auto ret(std::make_unique<std::istringstream>(m_str, std::ios_base::binary));
ret->imbue(std::locale::classic()); ret->imbue(std::locale::classic());
return ret; return MOVE_UNIQUE_PTR(ret);
} }
source_file_t::stream_ptr source_file_t::stream(const pstring &name) source_file_t::stream_ptr source_file_t::stream(const pstring &name)