summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-09-27 11:00:56 +1000
committer Vas Crabb <vas@vastheman.com>2020-09-27 11:00:56 +1000
commit6e807013c570ed6b5ff7f950a3b131914b9718f3 (patch)
tree86eb67544d14d9ee32a18467d7ba859f19f36a51 /src/lib/netlist
parent7dad0f4f58e2e0e59b72f3df672ecfe2c8168545 (diff)
Disable SOUND_DEBUG for non-debug builds, and srcclean
Diffstat (limited to 'src/lib/netlist')
-rw-r--r--src/lib/netlist/core/nets.h4
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx_lib.cpp18
-rw-r--r--src/lib/netlist/plib/gmres.h4
-rw-r--r--src/lib/netlist/plib/ptimed_queue.h2
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/netlist/core/nets.h b/src/lib/netlist/core/nets.h
index 8b1e81e7e24..8fe7ab6bb3c 100644
--- a/src/lib/netlist/core/nets.h
+++ b/src/lib/netlist/core/nets.h
@@ -21,7 +21,7 @@
// no action will be taken. This is academically cleaner, but slower than
// allowing this to happen and filter it during during "process".
-#define AVOID_NOOP_QUEUE_PUSHES (0)
+#define AVOID_NOOP_QUEUE_PUSHES (0)
namespace netlist
{
@@ -160,7 +160,7 @@ namespace netlist
if (m_in_queue == queue_status::DELAYED_DUE_TO_INACTIVE)
{
#if (AVOID_NOOP_QUEUE_PUSHES)
- if (m_next_scheduled_time > exec().time()
+ if (m_next_scheduled_time > exec().time()
&& (m_cur_Q != m_new_Q))
#else
if (m_next_scheduled_time > exec().time())
diff --git a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
index 51034eb3498..ad0ff1fbe5b 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
+++ b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
@@ -490,15 +490,15 @@ static NETLIST_START(CD4049_DIP)
NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
//DIPPINS( /* +--------------+ */
- // A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
- // A.G, /*G=/A |2 15| L=/F*/ F.L,
- // A.A, /* A |3 14| F */ F.F,
- // B.H, /*H=/B |4 13| NC */ NC.I,
- // B.B, /* B |5 4049 12| K=/E*/ E.K,
- // C.I, /*I=/C |6 11| E */ E.E,
- // C.C, /* C |7 10| J=/D*/ D.J,
- // A.VSS, /* VSS |8 9| D */ D.D
- // /* +--------------+ */
+ // A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
+ // A.G, /*G=/A |2 15| L=/F*/ F.L,
+ // A.A, /* A |3 14| F */ F.F,
+ // B.H, /*H=/B |4 13| NC */ NC.I,
+ // B.B, /* B |5 4049 12| K=/E*/ E.K,
+ // C.I, /*I=/C |6 11| E */ E.E,
+ // C.C, /* C |7 10| J=/D*/ D.J,
+ // A.VSS, /* VSS |8 9| D */ D.D
+ // /* +--------------+ */
//)
DIPPINS( /* +--------------+ */
A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
diff --git a/src/lib/netlist/plib/gmres.h b/src/lib/netlist/plib/gmres.h
index 16fcd1b3f4b..bb296833238 100644
--- a/src/lib/netlist/plib/gmres.h
+++ b/src/lib/netlist/plib/gmres.h
@@ -288,7 +288,7 @@ namespace plib
}
else
//rho_delta = accuracy * plib::sqrt(vec_mult2<FT>(n, rhs))
- // + 1e-4 * std::sqrt(n);
+ // + 1e-4 * std::sqrt(n);
rho_delta = accuracy * plib::sqrt(narrow_cast<FT>(n));
//
@@ -399,7 +399,7 @@ namespace plib
}
//for (std::size_t i = 0; i <= k; i++)
- // vec_add_mult_scalar(n, x, m_v[i], m_y[i]);
+ // vec_add_mult_scalar(n, x, m_v[i], m_y[i]);
return true;
}
return false;
diff --git a/src/lib/netlist/plib/ptimed_queue.h b/src/lib/netlist/plib/ptimed_queue.h
index 9df8a8fcd83..1807625b6b3 100644
--- a/src/lib/netlist/plib/ptimed_queue.h
+++ b/src/lib/netlist/plib/ptimed_queue.h
@@ -341,4 +341,4 @@ namespace plib {
} // namespace plib
#endif // PTIMED_QUEUE_H_
-#include <cstdlib>
+#include <cstdlib>