summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/netlist
diff options
context:
space:
mode:
author Peter Ferrie <peter.ferrie@gmail.com>2015-05-12 20:45:42 -0700
committer Peter Ferrie <peter.ferrie@gmail.com>2015-05-12 20:45:42 -0700
commit88f2f9d65d4ff0b2f82a640da865e5551250459e (patch)
tree12736a1b0b347afb66542d2020cf29e35721dba4 /src/emu/netlist
parente5e01fc725eb5a4631ef6a6f5eced73879e2fced (diff)
fix compile on MSVC2012 (nw)
Diffstat (limited to 'src/emu/netlist')
-rw-r--r--src/emu/netlist/analog/nld_twoterm.h2
-rw-r--r--src/emu/netlist/nl_util.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/netlist/analog/nld_twoterm.h b/src/emu/netlist/analog/nld_twoterm.h
index f72fa202689..9d0a1a0aed7 100644
--- a/src/emu/netlist/analog/nld_twoterm.h
+++ b/src/emu/netlist/analog/nld_twoterm.h
@@ -234,7 +234,7 @@ public:
{
nl_double a = (nVd - m_Vd) * m_VtInv;
if (a<1e-12 - 1.0) a = 1e-12 - 1.0;
- m_Vd = m_Vd + log1p(a) * m_Vt;
+ m_Vd = m_Vd + nl_math::e_log1p(a) * m_Vt;
const nl_double eVDVt = nl_math::exp(m_Vd * m_VtInv);
m_Id = m_Is * (eVDVt - 1.0);
diff --git a/src/emu/netlist/nl_util.h b/src/emu/netlist/nl_util.h
index 6aea597977a..cab4f82dfec 100644
--- a/src/emu/netlist/nl_util.h
+++ b/src/emu/netlist/nl_util.h
@@ -54,8 +54,8 @@ public:
ATTR_HOT inline static double log(const double x) { return std::log(x); }
ATTR_HOT inline static float log(const float x) { return std::log(x); }
#if defined(_MSC_VER) && _MSC_VER < 1800
- ATTR_HOT inline static double log1p(const double x) { return nl_math::log(1.0 + x); }
- ATTR_HOT inline static float log1p(const float x) { return nl_math::log(1.0 + x); }
+ ATTR_HOT inline static double e_log1p(const double x) { return nl_math::log(1.0 + x); }
+ ATTR_HOT inline static float e_log1p(const float x) { return nl_math::log(1.0 + x); }
#else
ATTR_HOT inline static double e_log1p(const double x) { return log1p(x); }
ATTR_HOT inline static float e_log1p(const float x) { return log1pf(x); }