Fix VS2015 compile. (nw)

This commit is contained in:
couriersud 2017-02-22 01:40:37 +01:00
parent a82ca2d244
commit 85d915f5cd
4 changed files with 11 additions and 4 deletions

View File

@ -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" />

View File

@ -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>

3
src/lib/netlist/nl_factory.cpp Normal file → Executable file
View File

@ -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())

4
src/lib/netlist/nl_factory.h Normal file → Executable file
View File

@ -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);