summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-09-24 07:54:07 +0200
committer couriersud <couriersud@gmx.org>2020-09-24 15:22:26 +0200
commita6fb699b6f07891004959632968b665a3df577e5 (patch)
tree2a453da70fdeff09167d6987e15df8882bd6a619 /src
parent0acb9992f4c73db6f865ed89411ce4db20cee9f2 (diff)
netlist: Fixed a couple of issues with various compilers.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/lib/netlist/buildVS/netlistlib.vcxproj5
-rwxr-xr-xsrc/lib/netlist/buildVS/netlistlib.vcxproj.filters15
-rw-r--r--src/lib/netlist/plib/pexception.h2
-rw-r--r--src/lib/netlist/plib/pfmtlog.h3
-rw-r--r--src/lib/netlist/plib/pmath.h2
-rw-r--r--src/lib/netlist/plib/ptime.h1
6 files changed, 25 insertions, 3 deletions
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj b/src/lib/netlist/buildVS/netlistlib.vcxproj
index 543d7680f29..85a6087fbf6 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj
@@ -117,7 +117,10 @@
<ClCompile Include="..\devices\nld_2102A.cpp" />
<ClCompile Include="..\devices\nld_4006.cpp" />
<ClCompile Include="..\devices\nld_4017.cpp" />
+ <ClCompile Include="..\devices\nld_4029.cpp" />
+ <ClCompile Include="..\devices\nld_4042.cpp" />
<ClCompile Include="..\devices\nld_4053.cpp" />
+ <ClCompile Include="..\devices\nld_4076.cpp" />
<ClCompile Include="..\devices\nld_74125.cpp" />
<ClCompile Include="..\devices\nld_74163.cpp" />
<ClCompile Include="..\devices\nld_74377.cpp" />
@@ -176,6 +179,8 @@
<ClCompile Include="..\devices\nlid_truthtable.cpp" />
<ClCompile Include="..\generated\nlm_modules_lib.cpp" />
<ClCompile Include="..\generated\static_solvers.cpp" />
+ <ClCompile Include="..\macro\modules\nlmod_ICL8038_DIP.cpp" />
+ <ClCompile Include="..\macro\modules\nlmod_NE556_DIP.cpp" />
<ClCompile Include="..\macro\modules\nlmod_RTEST.cpp" />
<ClCompile Include="..\macro\nlm_base_lib.cpp" />
<ClCompile Include="..\macro\nlm_cd4xxx_lib.cpp" />
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
index f858a2b9932..cb55a2d862e 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
@@ -294,6 +294,21 @@
<ClCompile Include="..\macro\modules\nlmod_RTEST.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\devices\nld_4042.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\devices\nld_4076.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\devices\nld_4029.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\macro\modules\nlmod_ICL8038_DIP.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\macro\modules\nlmod_NE556_DIP.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\nl_errstr.h">
diff --git a/src/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h
index 709f8810b83..7c5cf233306 100644
--- a/src/lib/netlist/plib/pexception.h
+++ b/src/lib/netlist/plib/pexception.h
@@ -39,7 +39,7 @@ namespace plib {
public:
explicit pexception(const pstring &text);
- const pstring &text() const noexcept { return m_text; }
+ const putf8string &text() const noexcept { return m_text; }
const char* what() const noexcept override { return m_text.c_str(); }
private:
diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h
index f00f3db7215..7ce562fbbf5 100644
--- a/src/lib/netlist/plib/pfmtlog.h
+++ b/src/lib/netlist/plib/pfmtlog.h
@@ -70,7 +70,8 @@ namespace plib {
// FIXME: need native support at some time
static constexpr const bool is_signed = true;
static char32_t fmt_spec() { return 'd'; }
- static void streamify(std::ostream &s, const compile_info::int128_type &v)
+ template <typename T, typename = std::enable_if_t<plib::is_arithmetic<T>::value>>
+ static void streamify(std::ostream &s, const T &v)
{
s << narrow_cast<long long>(v);
}
diff --git a/src/lib/netlist/plib/pmath.h b/src/lib/netlist/plib/pmath.h
index 01912dd2183..a59f566a91d 100644
--- a/src/lib/netlist/plib/pmath.h
+++ b/src/lib/netlist/plib/pmath.h
@@ -271,7 +271,7 @@ namespace plib
/// FIXME: limited implementation
///
template <typename T1, typename T2>
- static
+ static inline
auto pow(T1 v, T2 p) noexcept -> decltype(std::pow(v, p))
{
return std::pow(v, p);
diff --git a/src/lib/netlist/plib/ptime.h b/src/lib/netlist/plib/ptime.h
index ab55feb261b..528a0bbd503 100644
--- a/src/lib/netlist/plib/ptime.h
+++ b/src/lib/netlist/plib/ptime.h
@@ -63,6 +63,7 @@ namespace plib
constexpr explicit ptime(const ptime<O, RES> &rhs, T dummy = 0) noexcept
: m_time(static_cast<TYPE>(rhs.m_time))
{
+ plib::unused_var(dummy);
}
template <typename O>