From 85d915f5cdd8dab5fb5a16503904ae23f9c8708d Mon Sep 17 00:00:00 2001 From: couriersud Date: Wed, 22 Feb 2017 01:40:37 +0100 Subject: [PATCH] Fix VS2015 compile. (nw) --- src/lib/netlist/buildVS/netlistlib.vcxproj | 2 ++ src/lib/netlist/buildVS/netlistlib.vcxproj.filters | 6 ++++++ src/lib/netlist/nl_factory.cpp | 3 +-- src/lib/netlist/nl_factory.h | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/lib/netlist/nl_factory.cpp mode change 100644 => 100755 src/lib/netlist/nl_factory.h diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj b/src/lib/netlist/buildVS/netlistlib.vcxproj index a021ee46e12..454990813e5 100755 --- a/src/lib/netlist/buildVS/netlistlib.vcxproj +++ b/src/lib/netlist/buildVS/netlistlib.vcxproj @@ -121,6 +121,7 @@ + @@ -201,6 +202,7 @@ + diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters index ad25be9fbab..43793637be2 100755 --- a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters +++ b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters @@ -243,6 +243,9 @@ Source Files + + Source Files + @@ -560,5 +563,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp old mode 100644 new mode 100755 index 2ab15375d62..2bb49590c4b --- a/src/lib/netlist/nl_factory.cpp +++ b/src/lib/netlist/nl_factory.cpp @@ -49,7 +49,6 @@ element_t::~element_t() { } - // ---------------------------------------------------------------------------------------- // net_device_t_base_factory // ---------------------------------------------------------------------------------------- @@ -64,7 +63,7 @@ list_t::~list_t() clear(); } -void list_t::register_device(std::unique_ptr factory) +void list_t::register_device(std::unique_ptr &&factory) { for (auto & e : *this) if (e->name() == factory->name()) diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h old mode 100644 new mode 100755 index 2366a22faae..6f9138dc905 --- a/src/lib/netlist/nl_factory.h +++ b/src/lib/netlist/nl_factory.h @@ -87,12 +87,12 @@ namespace factory { template void register_device(const pstring &name, const pstring &classname, - const pstring &def_param) + const pstring &def_param) { register_device(std::unique_ptr(plib::palloc>(name, classname, def_param))); } - void register_device(std::unique_ptr factory); + void register_device(std::unique_ptr &&factory); element_t * factory_by_name(const pstring &devname);