From 1f3f5e0d574e256bc106ee4bc9ee701858585ca3 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 10 Jun 2022 16:11:21 +0200 Subject: netlist: fix bugs and more cpp instead of macros (#9897) * netlist: fix bugs and more cpp instead of macros - C-style comments converted to c++ - Fix crash in state saving code when an abort queue processing event is pending. - Fix a bug where a net could be twice in the queue. - Convert more macros to c++ - fixed SUBTARGET=nl build - fixed potential bugs which would allow a terminal to belong to more than one net. This is not possible even for a short time. - moved some member function definitions out-of-class. - moved code out-of-class - added constexpr where appropriate - fixed mamenl build - Cleanup and indentation --- src/lib/netlist/plib/pfunction.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/netlist/plib/pfunction.cpp') diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index 6d295f48a73..ed906a40385 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -78,18 +78,18 @@ namespace plib { { "G", narrow_cast( 1e9) }, // NOLINT: Giga { "M", narrow_cast( 1e6) }, // NOLINT: Mega { "k", narrow_cast( 1e3) }, // NOLINT: Kilo - { "h", narrow_cast( 1e2) }, // NOLINT: Hekto - //{ "da", narrow_cast(1e1) }, // NOLINT: Deka - { "d", narrow_cast(1e-1) }, // NOLINT: Dezi - { "c", narrow_cast(1e-2) }, // NOLINT: Zenti + { "h", narrow_cast( 1e2) }, // NOLINT: Hecto + //{ "da", narrow_cast(1e1) }, // NOLINT: Deca + { "d", narrow_cast(1e-1) }, // NOLINT: Deci + { "c", narrow_cast(1e-2) }, // NOLINT: Centi { "m", narrow_cast(1e-3) }, // NOLINT: Milli - { "μ", narrow_cast(1e-6) }, // NOLINT: Mikro + { "μ", narrow_cast(1e-6) }, // NOLINT: Micro { "n", narrow_cast(1e-9) }, // NOLINT: Nano - { "p", narrow_cast(1e-12) }, // NOLINT: Piko + { "p", narrow_cast(1e-12) }, // NOLINT: Pico { "f", narrow_cast(1e-15) }, // NOLINT: Femto { "a", narrow_cast(1e-18) }, // NOLINT: Atto { "z", narrow_cast(1e-21) }, // NOLINT: Zepto - { "y", narrow_cast(1e-24) }, // NOLINT: Yokto + { "y", narrow_cast(1e-24) }, // NOLINT: Yocto }; return units_si_stat; } -- cgit v1.2.3-70-g09d2