Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-25 13:54:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile on MSVC2012 (nw)

Browse Source
This commit is contained in:
Peter Ferrie 2015-05-12 20:45:42 -07:00
parent e5e01fc725
commit 88f2f9d65d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/netlist/analog/nld_twoterm.h
View File

@ -234,7 +234,7 @@ public:
{ {
nl_double a = (nVd - m_Vd) * m_VtInv; nl_double a = (nVd - m_Vd) * m_VtInv;
if (a<1e-12 - 1.0) a = 1e-12 - 1.0; 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); const nl_double eVDVt = nl_math::exp(m_Vd * m_VtInv);
m_Id = m_Is * (eVDVt - 1.0); m_Id = m_Is * (eVDVt - 1.0);

4
src/emu/netlist/nl_util.h
View File

@ -54,8 +54,8 @@ public:
ATTR_HOT inline static double log(const double x) { return std::log(x); } 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); } ATTR_HOT inline static float log(const float x) { return std::log(x); }
#if defined(_MSC_VER) && _MSC_VER < 1800 #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 double e_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 float e_log1p(const float x) { return nl_math::log(1.0 + x); }
#else #else
ATTR_HOT inline static double e_log1p(const double x) { return log1p(x); } 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); } ATTR_HOT inline static float e_log1p(const float x) { return log1pf(x); }