diff options
author | couriersud <couriersud@gmx.org> | 2017-02-22 01:40:37 +0100 |
---|---|---|
committer | couriersud <couriersud@gmx.org> | 2017-02-22 02:04:02 +0100 |
commit | 85d915f5cdd8dab5fb5a16503904ae23f9c8708d (patch) | |
tree | 929bb45096e952760b17273133ee9f3837ad4237 /src/lib | |
parent | a82ca2d244195ba79fcb34c6ccc964d3d906783d (diff) |
Fix VS2015 compile. (nw)
Diffstat (limited to 'src/lib')
-rwxr-xr-x | src/lib/netlist/buildVS/netlistlib.vcxproj | 2 | ||||
-rwxr-xr-x | src/lib/netlist/buildVS/netlistlib.vcxproj.filters | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | src/lib/netlist/nl_factory.cpp | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | src/lib/netlist/nl_factory.h | 4 |
4 files changed, 11 insertions, 4 deletions
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 @@ <ClCompile Include="..\devices\nld_74123.cpp" /> <ClCompile Include="..\devices\nld_74153.cpp" /> <ClCompile Include="..\devices\nld_74161.cpp" /> + <ClCompile Include="..\devices\nld_74164.cpp" /> <ClCompile Include="..\devices\nld_74165.cpp" /> <ClCompile Include="..\devices\nld_74166.cpp" /> <ClCompile Include="..\devices\nld_74174.cpp" /> @@ -201,6 +202,7 @@ <ClInclude Include="..\devices\nld_74123.h" /> <ClInclude Include="..\devices\nld_74153.h" /> <ClInclude Include="..\devices\nld_74161.h" /> + <ClInclude Include="..\devices\nld_74164.h" /> <ClInclude Include="..\devices\nld_74165.h" /> <ClInclude Include="..\devices\nld_74166.h" /> <ClInclude Include="..\devices\nld_74174.h" /> 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 @@ <ClCompile Include="..\devices\nld_7475.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\devices\nld_74164.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\nl_errstr.h"> @@ -560,5 +563,8 @@ <ClInclude Include="..\devices\nld_74175.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\devices\nld_74164.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp index 2ab15375d62..2bb49590c4b 100644..100755 --- 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<element_t> factory) +void list_t::register_device(std::unique_ptr<element_t> &&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 index 2366a22faae..6f9138dc905 100644..100755 --- a/src/lib/netlist/nl_factory.h +++ b/src/lib/netlist/nl_factory.h @@ -87,12 +87,12 @@ namespace factory { template<class device_class> void register_device(const pstring &name, const pstring &classname, - const pstring &def_param) + const pstring &def_param) { register_device(std::unique_ptr<element_t>(plib::palloc<device_element_t<device_class>>(name, classname, def_param))); } - void register_device(std::unique_ptr<element_t> factory); + void register_device(std::unique_ptr<element_t> &&factory); element_t * factory_by_name(const pstring &devname); |