From fe47fcf9f193f1a2ffb4d3eedfd134ff6b216e62 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 2 Oct 2020 19:57:06 +0200 Subject: [PATCH] netlist: more clang lint fixes. --- src/lib/netlist/build/makefile | 2 +- src/lib/netlist/devices/nld_4029.cpp | 2 +- src/lib/netlist/devices/nld_9321.cpp | 2 +- src/lib/netlist/generated/nld_devinc.h | 6 +- src/lib/netlist/generated/nlm_modules_lib.cpp | 2 +- src/lib/netlist/generated/static_solvers.cpp | 394 +++++++++--------- src/lib/netlist/plib/parray.h | 15 +- src/lib/netlist/plib/pchrono.h | 36 +- src/lib/netlist/plib/pexception.cpp | 2 +- src/lib/netlist/plib/pexception.h | 2 +- src/lib/netlist/plib/pfmtlog.h | 2 +- src/lib/netlist/plib/pfunction.cpp | 43 +- src/lib/netlist/plib/pfunction.h | 22 +- src/lib/netlist/plib/plists.h | 5 +- src/lib/netlist/plib/pmatrix2d.h | 6 +- src/lib/netlist/plib/pmatrix_cr.h | 161 +++---- src/lib/netlist/plib/pmempool.h | 5 +- src/lib/netlist/plib/prandom.h | 8 +- src/lib/netlist/plib/pstream.h | 2 +- src/lib/netlist/plib/ptimed_queue.h | 5 +- src/lib/netlist/prg/nltool.cpp | 4 +- src/lib/netlist/solver/nld_solver.cpp | 4 +- 22 files changed, 384 insertions(+), 346 deletions(-) diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index 9d8c14e1b54..a324acb463b 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -58,7 +58,7 @@ TIDY_SOURCES = $(ALLSOURCES) #TIDY_SOURCES = $(SRC)/devices/nld_7442.cpp $(SRC)/devices/nld_7492.cpp -TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix +#TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix #TIDY_FLAGS = -checks=llvm-include-order -fix #TIDY_FLAGS = -checks=llvm-namespace-comment -fix #TIDY_FLAGS = -checks=modernize-use-override -fix diff --git a/src/lib/netlist/devices/nld_4029.cpp b/src/lib/netlist/devices/nld_4029.cpp index a3de0e7192b..4582746bf24 100644 --- a/src/lib/netlist/devices/nld_4029.cpp +++ b/src/lib/netlist/devices/nld_4029.cpp @@ -146,7 +146,7 @@ namespace devices , m_CLK(*this, "CLK", NETLIB_DELEGATE(clk)) , m_clk_old(*this, "m_clk_old", false) , m_Q(*this, {"Q1", "Q2", "Q3", "Q4"}) - , m_CO(*this, "CO", 0) + , m_CO(*this, "CO", false) , m_cnt(*this, "m_cnt", 0) , m_power_pins(*this) { diff --git a/src/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp index 5adffc3a313..29d63b2b3fc 100644 --- a/src/lib/netlist/devices/nld_9321.cpp +++ b/src/lib/netlist/devices/nld_9321.cpp @@ -50,7 +50,7 @@ namespace netlist NETLIB_HANDLERI(e) { - m_enable = m_E() ? 0 : 1; + m_enable = m_E() ? false : true; m_o = (m_A[1]() << 1) | m_A[0](); for (std::size_t i=0; i<4; i++) m_D[i].push((i == m_o && m_enable) ? 0 : 1, NLTIME_FROM_NS(18)); diff --git a/src/lib/netlist/generated/nld_devinc.h b/src/lib/netlist/generated/nld_devinc.h index 1a2fa7eeca3..e916998c93e 100755 --- a/src/lib/netlist/generated/nld_devinc.h +++ b/src/lib/netlist/generated/nld_devinc.h @@ -103,7 +103,7 @@ NET_REGISTER_DEVEXT(CS, __VA_ARGS__) // --------------------------------------------------------------------- -// Source: ../devices/nld_2102A.cpp +// Source: ../devices/nld_2102a.cpp // --------------------------------------------------------------------- // usage : RAM_2102A(name, CEQ, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, RWQ, DI) @@ -520,7 +520,7 @@ NET_REGISTER_DEVEXT(TTL_8277, __VA_ARGS__) // --------------------------------------------------------------------- -// Source: ../devices/nld_82S115.cpp +// Source: ../devices/nld_82s115.cpp // --------------------------------------------------------------------- // usage : PROM_82S115(name, CE1Q, CE2, A0, A1, A2, A3, A4, A5, A6, A7, A8, STROBE) @@ -529,7 +529,7 @@ NET_REGISTER_DEVEXT(PROM_82S115, __VA_ARGS__) // --------------------------------------------------------------------- -// Source: ../devices/nld_82S16.cpp +// Source: ../devices/nld_82s16.cpp // --------------------------------------------------------------------- // usage : TTL_82S16(name, ) diff --git a/src/lib/netlist/generated/nlm_modules_lib.cpp b/src/lib/netlist/generated/nlm_modules_lib.cpp index 7f91075ac40..7162c84023d 100755 --- a/src/lib/netlist/generated/nlm_modules_lib.cpp +++ b/src/lib/netlist/generated/nlm_modules_lib.cpp @@ -1,7 +1,7 @@ // license:CC0 // copyright-holders:Couriersud -// File programmatically created Sun Sep 13 20:49:39 2020 +// File programmatically created Wed Sep 30 11:02:38 2020 #include "devices/net_lib.h" diff --git a/src/lib/netlist/generated/static_solvers.cpp b/src/lib/netlist/generated/static_solvers.cpp index 3dfe1def465..29f37500718 100644 --- a/src/lib/netlist/generated/static_solvers.cpp +++ b/src/lib/netlist/generated/static_solvers.cpp @@ -72340,399 +72340,399 @@ const plib::dynlib_static_sym nl_static_solver_syms[] = { #if !defined(__EMSCRIPTEN__) // elim - {"nl_gcr_11c2ae166b240b6e_10_double_double", reinterpret_cast(&nl_gcr_11c2ae166b240b6e_10_double_double)}, + {"nl_gcr_11c2ae166b240b6e_10_double_double", reinterpret_cast(&nl_gcr_11c2ae166b240b6e_10_double_double)}, // NOLINT // tankbatt - {"nl_gcr_124f7aa10f044582_16_double_double", reinterpret_cast(&nl_gcr_124f7aa10f044582_16_double_double)}, + {"nl_gcr_124f7aa10f044582_16_double_double", reinterpret_cast(&nl_gcr_124f7aa10f044582_16_double_double)}, // NOLINT // armora - {"nl_gcr_1250f340dea396ae_22_double_double", reinterpret_cast(&nl_gcr_1250f340dea396ae_22_double_double)}, + {"nl_gcr_1250f340dea396ae_22_double_double", reinterpret_cast(&nl_gcr_1250f340dea396ae_22_double_double)}, // NOLINT // astrob - {"nl_gcr_13833bf8c127deaa_154_double_double", reinterpret_cast(&nl_gcr_13833bf8c127deaa_154_double_double)}, + {"nl_gcr_13833bf8c127deaa_154_double_double", reinterpret_cast(&nl_gcr_13833bf8c127deaa_154_double_double)}, // NOLINT // pongf - {"nl_gcr_13e7b5ac1a260dbf_10_double_double", reinterpret_cast(&nl_gcr_13e7b5ac1a260dbf_10_double_double)}, + {"nl_gcr_13e7b5ac1a260dbf_10_double_double", reinterpret_cast(&nl_gcr_13e7b5ac1a260dbf_10_double_double)}, // NOLINT // tailg - {"nl_gcr_144ed14e6bafdb_119_double_double", reinterpret_cast(&nl_gcr_144ed14e6bafdb_119_double_double)}, + {"nl_gcr_144ed14e6bafdb_119_double_double", reinterpret_cast(&nl_gcr_144ed14e6bafdb_119_double_double)}, // NOLINT // spacewar - {"nl_gcr_15e8f6fb021de0f9_28_double_double", reinterpret_cast(&nl_gcr_15e8f6fb021de0f9_28_double_double)}, + {"nl_gcr_15e8f6fb021de0f9_28_double_double", reinterpret_cast(&nl_gcr_15e8f6fb021de0f9_28_double_double)}, // NOLINT // dpatrol - {"nl_gcr_18f4d9160b51d613_20_double_double", reinterpret_cast(&nl_gcr_18f4d9160b51d613_20_double_double)}, + {"nl_gcr_18f4d9160b51d613_20_double_double", reinterpret_cast(&nl_gcr_18f4d9160b51d613_20_double_double)}, // NOLINT // starhawk - {"nl_gcr_1f1086787c94f97c_40_double_double", reinterpret_cast(&nl_gcr_1f1086787c94f97c_40_double_double)}, + {"nl_gcr_1f1086787c94f97c_40_double_double", reinterpret_cast(&nl_gcr_1f1086787c94f97c_40_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_1fad5cda2646cf42_30_double_double", reinterpret_cast(&nl_gcr_1fad5cda2646cf42_30_double_double)}, + {"nl_gcr_1fad5cda2646cf42_30_double_double", reinterpret_cast(&nl_gcr_1fad5cda2646cf42_30_double_double)}, // NOLINT // sspeedr - {"nl_gcr_2294220d3c91e762_176_double_double", reinterpret_cast(&nl_gcr_2294220d3c91e762_176_double_double)}, + {"nl_gcr_2294220d3c91e762_176_double_double", reinterpret_cast(&nl_gcr_2294220d3c91e762_176_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_24643c159711f292_95_double_double", reinterpret_cast(&nl_gcr_24643c159711f292_95_double_double)}, + {"nl_gcr_24643c159711f292_95_double_double", reinterpret_cast(&nl_gcr_24643c159711f292_95_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_287a160e7c36b5b0_96_double_double", reinterpret_cast(&nl_gcr_287a160e7c36b5b0_96_double_double)}, + {"nl_gcr_287a160e7c36b5b0_96_double_double", reinterpret_cast(&nl_gcr_287a160e7c36b5b0_96_double_double)}, // NOLINT // elim - {"nl_gcr_28b736fe552777a9_45_double_double", reinterpret_cast(&nl_gcr_28b736fe552777a9_45_double_double)}, + {"nl_gcr_28b736fe552777a9_45_double_double", reinterpret_cast(&nl_gcr_28b736fe552777a9_45_double_double)}, // NOLINT // kidniki - {"nl_gcr_294dde1e0ecca6d0_37_double_double", reinterpret_cast(&nl_gcr_294dde1e0ecca6d0_37_double_double)}, + {"nl_gcr_294dde1e0ecca6d0_37_double_double", reinterpret_cast(&nl_gcr_294dde1e0ecca6d0_37_double_double)}, // NOLINT // ripoff - {"nl_gcr_295cf2e2f3d489bf_12_double_double", reinterpret_cast(&nl_gcr_295cf2e2f3d489bf_12_double_double)}, + {"nl_gcr_295cf2e2f3d489bf_12_double_double", reinterpret_cast(&nl_gcr_295cf2e2f3d489bf_12_double_double)}, // NOLINT // spacfury - {"nl_gcr_2a153513d3e8e2cc_53_double_double", reinterpret_cast(&nl_gcr_2a153513d3e8e2cc_53_double_double)}, + {"nl_gcr_2a153513d3e8e2cc_53_double_double", reinterpret_cast(&nl_gcr_2a153513d3e8e2cc_53_double_double)}, // NOLINT // boxingb - {"nl_gcr_2f84bc98d737730b_22_double_double", reinterpret_cast(&nl_gcr_2f84bc98d737730b_22_double_double)}, + {"nl_gcr_2f84bc98d737730b_22_double_double", reinterpret_cast(&nl_gcr_2f84bc98d737730b_22_double_double)}, // NOLINT // tankbatt - {"nl_gcr_328d886b444b586b_137_double_double", reinterpret_cast(&nl_gcr_328d886b444b586b_137_double_double)}, + {"nl_gcr_328d886b444b586b_137_double_double", reinterpret_cast(&nl_gcr_328d886b444b586b_137_double_double)}, // NOLINT // astrob - {"nl_gcr_339c6b457f339538_159_double_double", reinterpret_cast(&nl_gcr_339c6b457f339538_159_double_double)}, + {"nl_gcr_339c6b457f339538_159_double_double", reinterpret_cast(&nl_gcr_339c6b457f339538_159_double_double)}, // NOLINT // solarq - {"nl_gcr_34e910fc1896999f_76_double_double", reinterpret_cast(&nl_gcr_34e910fc1896999f_76_double_double)}, + {"nl_gcr_34e910fc1896999f_76_double_double", reinterpret_cast(&nl_gcr_34e910fc1896999f_76_double_double)}, // NOLINT // sspeedr - {"nl_gcr_3e833834e5ce5aee_13_double_double", reinterpret_cast(&nl_gcr_3e833834e5ce5aee_13_double_double)}, + {"nl_gcr_3e833834e5ce5aee_13_double_double", reinterpret_cast(&nl_gcr_3e833834e5ce5aee_13_double_double)}, // NOLINT // astrob - {"nl_gcr_41c6441d98369158_20_double_double", reinterpret_cast(&nl_gcr_41c6441d98369158_20_double_double)}, + {"nl_gcr_41c6441d98369158_20_double_double", reinterpret_cast(&nl_gcr_41c6441d98369158_20_double_double)}, // NOLINT // warrior - {"nl_gcr_42a31ce5c187b308_12_double_double", reinterpret_cast(&nl_gcr_42a31ce5c187b308_12_double_double)}, + {"nl_gcr_42a31ce5c187b308_12_double_double", reinterpret_cast(&nl_gcr_42a31ce5c187b308_12_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_42c57d523cac30d0_122_double_double", reinterpret_cast(&nl_gcr_42c57d523cac30d0_122_double_double)}, + {"nl_gcr_42c57d523cac30d0_122_double_double", reinterpret_cast(&nl_gcr_42c57d523cac30d0_122_double_double)}, // NOLINT // ripoff - {"nl_gcr_43188bf576854ae0_10_double_double", reinterpret_cast(&nl_gcr_43188bf576854ae0_10_double_double)}, + {"nl_gcr_43188bf576854ae0_10_double_double", reinterpret_cast(&nl_gcr_43188bf576854ae0_10_double_double)}, // NOLINT // destroyr - {"nl_gcr_4334c95878d1be92_399_double_double", reinterpret_cast(&nl_gcr_4334c95878d1be92_399_double_double)}, + {"nl_gcr_4334c95878d1be92_399_double_double", reinterpret_cast(&nl_gcr_4334c95878d1be92_399_double_double)}, // NOLINT // kidniki - {"nl_gcr_43f7ff9bc651cc7a_198_double_double", reinterpret_cast(&nl_gcr_43f7ff9bc651cc7a_198_double_double)}, + {"nl_gcr_43f7ff9bc651cc7a_198_double_double", reinterpret_cast(&nl_gcr_43f7ff9bc651cc7a_198_double_double)}, // NOLINT // gamemachine - {"nl_gcr_491f95430bfdfd05_19_double_double", reinterpret_cast(&nl_gcr_491f95430bfdfd05_19_double_double)}, + {"nl_gcr_491f95430bfdfd05_19_double_double", reinterpret_cast(&nl_gcr_491f95430bfdfd05_19_double_double)}, // NOLINT // sspeedr - {"nl_gcr_4a8e2b707bbac8a6_95_double_double", reinterpret_cast(&nl_gcr_4a8e2b707bbac8a6_95_double_double)}, + {"nl_gcr_4a8e2b707bbac8a6_95_double_double", reinterpret_cast(&nl_gcr_4a8e2b707bbac8a6_95_double_double)}, // NOLINT // ripoff - {"nl_gcr_4b5ecfbb8f9fa97b_29_double_double", reinterpret_cast(&nl_gcr_4b5ecfbb8f9fa97b_29_double_double)}, + {"nl_gcr_4b5ecfbb8f9fa97b_29_double_double", reinterpret_cast(&nl_gcr_4b5ecfbb8f9fa97b_29_double_double)}, // NOLINT // gtrak10 - {"nl_gcr_4c46fdf7c0037727_43_double_double", reinterpret_cast(&nl_gcr_4c46fdf7c0037727_43_double_double)}, + {"nl_gcr_4c46fdf7c0037727_43_double_double", reinterpret_cast(&nl_gcr_4c46fdf7c0037727_43_double_double)}, // NOLINT // solarq - {"nl_gcr_4cb524006206eb1a_25_double_double", reinterpret_cast(&nl_gcr_4cb524006206eb1a_25_double_double)}, + {"nl_gcr_4cb524006206eb1a_25_double_double", reinterpret_cast(&nl_gcr_4cb524006206eb1a_25_double_double)}, // NOLINT // spacfury - {"nl_gcr_4dbd0f2aec7ef707_110_double_double", reinterpret_cast(&nl_gcr_4dbd0f2aec7ef707_110_double_double)}, + {"nl_gcr_4dbd0f2aec7ef707_110_double_double", reinterpret_cast(&nl_gcr_4dbd0f2aec7ef707_110_double_double)}, // NOLINT // solarq - {"nl_gcr_4e4931ccbfb7a3c_70_double_double", reinterpret_cast(&nl_gcr_4e4931ccbfb7a3c_70_double_double)}, + {"nl_gcr_4e4931ccbfb7a3c_70_double_double", reinterpret_cast(&nl_gcr_4e4931ccbfb7a3c_70_double_double)}, // NOLINT // fireone - {"nl_gcr_4f2b2f3cdc384f75_41_double_double", reinterpret_cast(&nl_gcr_4f2b2f3cdc384f75_41_double_double)}, + {"nl_gcr_4f2b2f3cdc384f75_41_double_double", reinterpret_cast(&nl_gcr_4f2b2f3cdc384f75_41_double_double)}, // NOLINT // boxingb - {"nl_gcr_50f5194a994d56ec_16_double_double", reinterpret_cast(&nl_gcr_50f5194a994d56ec_16_double_double)}, + {"nl_gcr_50f5194a994d56ec_16_double_double", reinterpret_cast(&nl_gcr_50f5194a994d56ec_16_double_double)}, // NOLINT // starhawk - {"nl_gcr_528a27fe9ed07d67_45_double_double", reinterpret_cast(&nl_gcr_528a27fe9ed07d67_45_double_double)}, + {"nl_gcr_528a27fe9ed07d67_45_double_double", reinterpret_cast(&nl_gcr_528a27fe9ed07d67_45_double_double)}, // NOLINT // astrob - {"nl_gcr_536c3652eb3bc075_46_double_double", reinterpret_cast(&nl_gcr_536c3652eb3bc075_46_double_double)}, + {"nl_gcr_536c3652eb3bc075_46_double_double", reinterpret_cast(&nl_gcr_536c3652eb3bc075_46_double_double)}, // NOLINT // boxingb - {"nl_gcr_53e1117fdb16f546_23_double_double", reinterpret_cast(&nl_gcr_53e1117fdb16f546_23_double_double)}, + {"nl_gcr_53e1117fdb16f546_23_double_double", reinterpret_cast(&nl_gcr_53e1117fdb16f546_23_double_double)}, // NOLINT // cheekyms - {"nl_gcr_546396f65ce48700_12_double_double", reinterpret_cast(&nl_gcr_546396f65ce48700_12_double_double)}, + {"nl_gcr_546396f65ce48700_12_double_double", reinterpret_cast(&nl_gcr_546396f65ce48700_12_double_double)}, // NOLINT // dpatrol - {"nl_gcr_59cb6bf7cb9d17dc_7_double_double", reinterpret_cast(&nl_gcr_59cb6bf7cb9d17dc_7_double_double)}, + {"nl_gcr_59cb6bf7cb9d17dc_7_double_double", reinterpret_cast(&nl_gcr_59cb6bf7cb9d17dc_7_double_double)}, // NOLINT // breakout - {"nl_gcr_5a3419e2809520de_13_double_double", reinterpret_cast(&nl_gcr_5a3419e2809520de_13_double_double)}, + {"nl_gcr_5a3419e2809520de_13_double_double", reinterpret_cast(&nl_gcr_5a3419e2809520de_13_double_double)}, // NOLINT // segausb - {"nl_gcr_5b73834d5f313d38_12_double_double", reinterpret_cast(&nl_gcr_5b73834d5f313d38_12_double_double)}, + {"nl_gcr_5b73834d5f313d38_12_double_double", reinterpret_cast(&nl_gcr_5b73834d5f313d38_12_double_double)}, // NOLINT // tailg - {"nl_gcr_5ccf7da1202da2e5_31_double_double", reinterpret_cast(&nl_gcr_5ccf7da1202da2e5_31_double_double)}, + {"nl_gcr_5ccf7da1202da2e5_31_double_double", reinterpret_cast(&nl_gcr_5ccf7da1202da2e5_31_double_double)}, // NOLINT // starcas - {"nl_gcr_5d550fc7441617a2_109_double_double", reinterpret_cast(&nl_gcr_5d550fc7441617a2_109_double_double)}, + {"nl_gcr_5d550fc7441617a2_109_double_double", reinterpret_cast(&nl_gcr_5d550fc7441617a2_109_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_6041272373b8603c_178_double_double", reinterpret_cast(&nl_gcr_6041272373b8603c_178_double_double)}, + {"nl_gcr_6041272373b8603c_178_double_double", reinterpret_cast(&nl_gcr_6041272373b8603c_178_double_double)}, // NOLINT // astrob - {"nl_gcr_62464664b1c5aa1e_27_double_double", reinterpret_cast(&nl_gcr_62464664b1c5aa1e_27_double_double)}, + {"nl_gcr_62464664b1c5aa1e_27_double_double", reinterpret_cast(&nl_gcr_62464664b1c5aa1e_27_double_double)}, // NOLINT // solarq - {"nl_gcr_62612f71055b8fd4_303_double_double", reinterpret_cast(&nl_gcr_62612f71055b8fd4_303_double_double)}, + {"nl_gcr_62612f71055b8fd4_303_double_double", reinterpret_cast(&nl_gcr_62612f71055b8fd4_303_double_double)}, // NOLINT // konami1x - {"nl_gcr_62b99b9904a8c804_49_double_double", reinterpret_cast(&nl_gcr_62b99b9904a8c804_49_double_double)}, + {"nl_gcr_62b99b9904a8c804_49_double_double", reinterpret_cast(&nl_gcr_62b99b9904a8c804_49_double_double)}, // NOLINT // fireone - {"nl_gcr_643133e86b2b1628_73_double_double", reinterpret_cast(&nl_gcr_643133e86b2b1628_73_double_double)}, + {"nl_gcr_643133e86b2b1628_73_double_double", reinterpret_cast(&nl_gcr_643133e86b2b1628_73_double_double)}, // NOLINT // starfire - {"nl_gcr_649ebca7fa6793ed_27_double_double", reinterpret_cast(&nl_gcr_649ebca7fa6793ed_27_double_double)}, + {"nl_gcr_649ebca7fa6793ed_27_double_double", reinterpret_cast(&nl_gcr_649ebca7fa6793ed_27_double_double)}, // NOLINT // armora - {"nl_gcr_64e460d8f716cd89_58_double_double", reinterpret_cast(&nl_gcr_64e460d8f716cd89_58_double_double)}, + {"nl_gcr_64e460d8f716cd89_58_double_double", reinterpret_cast(&nl_gcr_64e460d8f716cd89_58_double_double)}, // NOLINT // flyball - {"nl_gcr_6622b53554e3776_291_double_double", reinterpret_cast(&nl_gcr_6622b53554e3776_291_double_double)}, + {"nl_gcr_6622b53554e3776_291_double_double", reinterpret_cast(&nl_gcr_6622b53554e3776_291_double_double)}, // NOLINT // solarq - {"nl_gcr_66496d6073aca98e_20_double_double", reinterpret_cast(&nl_gcr_66496d6073aca98e_20_double_double)}, + {"nl_gcr_66496d6073aca98e_20_double_double", reinterpret_cast(&nl_gcr_66496d6073aca98e_20_double_double)}, // NOLINT // starhawk - {"nl_gcr_67838e11f714c455_12_double_double", reinterpret_cast(&nl_gcr_67838e11f714c455_12_double_double)}, + {"nl_gcr_67838e11f714c455_12_double_double", reinterpret_cast(&nl_gcr_67838e11f714c455_12_double_double)}, // NOLINT // ripoff - {"nl_gcr_698d5dd47fb16d5_16_double_double", reinterpret_cast(&nl_gcr_698d5dd47fb16d5_16_double_double)}, + {"nl_gcr_698d5dd47fb16d5_16_double_double", reinterpret_cast(&nl_gcr_698d5dd47fb16d5_16_double_double)}, // NOLINT // astrob - {"nl_gcr_6c24726f30e8dc34_15_double_double", reinterpret_cast(&nl_gcr_6c24726f30e8dc34_15_double_double)}, + {"nl_gcr_6c24726f30e8dc34_15_double_double", reinterpret_cast(&nl_gcr_6c24726f30e8dc34_15_double_double)}, // NOLINT // spacfury - {"nl_gcr_6eae7b15cd376318_43_double_double", reinterpret_cast(&nl_gcr_6eae7b15cd376318_43_double_double)}, + {"nl_gcr_6eae7b15cd376318_43_double_double", reinterpret_cast(&nl_gcr_6eae7b15cd376318_43_double_double)}, // NOLINT // barrier - {"nl_gcr_6ef39a62161d596c_47_double_double", reinterpret_cast(&nl_gcr_6ef39a62161d596c_47_double_double)}, + {"nl_gcr_6ef39a62161d596c_47_double_double", reinterpret_cast(&nl_gcr_6ef39a62161d596c_47_double_double)}, // NOLINT // starhawk - {"nl_gcr_723fa454468a93d_7_double_double", reinterpret_cast(&nl_gcr_723fa454468a93d_7_double_double)}, + {"nl_gcr_723fa454468a93d_7_double_double", reinterpret_cast(&nl_gcr_723fa454468a93d_7_double_double)}, // NOLINT // cheekyms - {"nl_gcr_733c72a820fdbd1f_7_double_double", reinterpret_cast(&nl_gcr_733c72a820fdbd1f_7_double_double)}, + {"nl_gcr_733c72a820fdbd1f_7_double_double", reinterpret_cast(&nl_gcr_733c72a820fdbd1f_7_double_double)}, // NOLINT // tailg - {"nl_gcr_7388106355fb27c3_12_double_double", reinterpret_cast(&nl_gcr_7388106355fb27c3_12_double_double)}, + {"nl_gcr_7388106355fb27c3_12_double_double", reinterpret_cast(&nl_gcr_7388106355fb27c3_12_double_double)}, // NOLINT // tp1985 - {"nl_gcr_73f2ba8ad4a45b26_10_double_double", reinterpret_cast(&nl_gcr_73f2ba8ad4a45b26_10_double_double)}, + {"nl_gcr_73f2ba8ad4a45b26_10_double_double", reinterpret_cast(&nl_gcr_73f2ba8ad4a45b26_10_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_7425594cec8024ad_30_double_double", reinterpret_cast(&nl_gcr_7425594cec8024ad_30_double_double)}, + {"nl_gcr_7425594cec8024ad_30_double_double", reinterpret_cast(&nl_gcr_7425594cec8024ad_30_double_double)}, // NOLINT // tp1985 - {"nl_gcr_74349e9889a2630b_7_double_double", reinterpret_cast(&nl_gcr_74349e9889a2630b_7_double_double)}, + {"nl_gcr_74349e9889a2630b_7_double_double", reinterpret_cast(&nl_gcr_74349e9889a2630b_7_double_double)}, // NOLINT // gunfight - {"nl_gcr_743595e64cee0a5e_112_double_double", reinterpret_cast(&nl_gcr_743595e64cee0a5e_112_double_double)}, + {"nl_gcr_743595e64cee0a5e_112_double_double", reinterpret_cast(&nl_gcr_743595e64cee0a5e_112_double_double)}, // NOLINT // ripoff - {"nl_gcr_76c9e236353caed1_35_double_double", reinterpret_cast(&nl_gcr_76c9e236353caed1_35_double_double)}, + {"nl_gcr_76c9e236353caed1_35_double_double", reinterpret_cast(&nl_gcr_76c9e236353caed1_35_double_double)}, // NOLINT // gamemachine - {"nl_gcr_782d79b5cbe953b1_7_double_double", reinterpret_cast(&nl_gcr_782d79b5cbe953b1_7_double_double)}, + {"nl_gcr_782d79b5cbe953b1_7_double_double", reinterpret_cast(&nl_gcr_782d79b5cbe953b1_7_double_double)}, // NOLINT // barrier - {"nl_gcr_79e756c5892cf87d_31_double_double", reinterpret_cast(&nl_gcr_79e756c5892cf87d_31_double_double)}, + {"nl_gcr_79e756c5892cf87d_31_double_double", reinterpret_cast(&nl_gcr_79e756c5892cf87d_31_double_double)}, // NOLINT // breakout - {"nl_gcr_7a42b97d838ca073_7_double_double", reinterpret_cast(&nl_gcr_7a42b97d838ca073_7_double_double)}, + {"nl_gcr_7a42b97d838ca073_7_double_double", reinterpret_cast(&nl_gcr_7a42b97d838ca073_7_double_double)}, // NOLINT // fireone - {"nl_gcr_7aee4423e3fdbfda_128_double_double", reinterpret_cast(&nl_gcr_7aee4423e3fdbfda_128_double_double)}, + {"nl_gcr_7aee4423e3fdbfda_128_double_double", reinterpret_cast(&nl_gcr_7aee4423e3fdbfda_128_double_double)}, // NOLINT // astrob - {"nl_gcr_7c86a9bc1c6aef4c_7_double_double", reinterpret_cast(&nl_gcr_7c86a9bc1c6aef4c_7_double_double)}, + {"nl_gcr_7c86a9bc1c6aef4c_7_double_double", reinterpret_cast(&nl_gcr_7c86a9bc1c6aef4c_7_double_double)}, // NOLINT // solarq - {"nl_gcr_7caaa135bff3d9f3_15_double_double", reinterpret_cast(&nl_gcr_7caaa135bff3d9f3_15_double_double)}, + {"nl_gcr_7caaa135bff3d9f3_15_double_double", reinterpret_cast(&nl_gcr_7caaa135bff3d9f3_15_double_double)}, // NOLINT // warrior - {"nl_gcr_8003d4625273fa4d_10_double_double", reinterpret_cast(&nl_gcr_8003d4625273fa4d_10_double_double)}, + {"nl_gcr_8003d4625273fa4d_10_double_double", reinterpret_cast(&nl_gcr_8003d4625273fa4d_10_double_double)}, // NOLINT // kidniki - {"nl_gcr_8046625a0fe0959_21_double_double", reinterpret_cast(&nl_gcr_8046625a0fe0959_21_double_double)}, + {"nl_gcr_8046625a0fe0959_21_double_double", reinterpret_cast(&nl_gcr_8046625a0fe0959_21_double_double)}, // NOLINT // mario - {"nl_gcr_80b4b1e5cc58d303_29_double_double", reinterpret_cast(&nl_gcr_80b4b1e5cc58d303_29_double_double)}, + {"nl_gcr_80b4b1e5cc58d303_29_double_double", reinterpret_cast(&nl_gcr_80b4b1e5cc58d303_29_double_double)}, // NOLINT // elim - {"nl_gcr_81f40a54af2ca202_10_double_double", reinterpret_cast(&nl_gcr_81f40a54af2ca202_10_double_double)}, + {"nl_gcr_81f40a54af2ca202_10_double_double", reinterpret_cast(&nl_gcr_81f40a54af2ca202_10_double_double)}, // NOLINT // sundance - {"nl_gcr_8446e63d7842f6a6_70_double_double", reinterpret_cast(&nl_gcr_8446e63d7842f6a6_70_double_double)}, + {"nl_gcr_8446e63d7842f6a6_70_double_double", reinterpret_cast(&nl_gcr_8446e63d7842f6a6_70_double_double)}, // NOLINT // dpatrol - {"nl_gcr_85652d3e3ada285a_10_double_double", reinterpret_cast(&nl_gcr_85652d3e3ada285a_10_double_double)}, + {"nl_gcr_85652d3e3ada285a_10_double_double", reinterpret_cast(&nl_gcr_85652d3e3ada285a_10_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_861d39f81d29d51_12_double_double", reinterpret_cast(&nl_gcr_861d39f81d29d51_12_double_double)}, + {"nl_gcr_861d39f81d29d51_12_double_double", reinterpret_cast(&nl_gcr_861d39f81d29d51_12_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_864a61c57bac9c38_123_double_double", reinterpret_cast(&nl_gcr_864a61c57bac9c38_123_double_double)}, + {"nl_gcr_864a61c57bac9c38_123_double_double", reinterpret_cast(&nl_gcr_864a61c57bac9c38_123_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_87cb2c78a2628efd_7_double_double", reinterpret_cast(&nl_gcr_87cb2c78a2628efd_7_double_double)}, + {"nl_gcr_87cb2c78a2628efd_7_double_double", reinterpret_cast(&nl_gcr_87cb2c78a2628efd_7_double_double)}, // NOLINT // starcas - {"nl_gcr_88a8ef5f6bd43d48_12_double_double", reinterpret_cast(&nl_gcr_88a8ef5f6bd43d48_12_double_double)}, + {"nl_gcr_88a8ef5f6bd43d48_12_double_double", reinterpret_cast(&nl_gcr_88a8ef5f6bd43d48_12_double_double)}, // NOLINT // breakout - {"nl_gcr_8a1565d1413f42f7_31_double_double", reinterpret_cast(&nl_gcr_8a1565d1413f42f7_31_double_double)}, + {"nl_gcr_8a1565d1413f42f7_31_double_double", reinterpret_cast(&nl_gcr_8a1565d1413f42f7_31_double_double)}, // NOLINT // starhawk - {"nl_gcr_8b1ac1e181eec3fc_40_double_double", reinterpret_cast(&nl_gcr_8b1ac1e181eec3fc_40_double_double)}, + {"nl_gcr_8b1ac1e181eec3fc_40_double_double", reinterpret_cast(&nl_gcr_8b1ac1e181eec3fc_40_double_double)}, // NOLINT // rebound - {"nl_gcr_8bec817b324dcc3_28_double_double", reinterpret_cast(&nl_gcr_8bec817b324dcc3_28_double_double)}, + {"nl_gcr_8bec817b324dcc3_28_double_double", reinterpret_cast(&nl_gcr_8bec817b324dcc3_28_double_double)}, // NOLINT // cocoloco - {"nl_gcr_8c0f7f2284333de5_16_double_double", reinterpret_cast(&nl_gcr_8c0f7f2284333de5_16_double_double)}, + {"nl_gcr_8c0f7f2284333de5_16_double_double", reinterpret_cast(&nl_gcr_8c0f7f2284333de5_16_double_double)}, // NOLINT // spacfury - {"nl_gcr_8c1dd4afcf0f8ea2_15_double_double", reinterpret_cast(&nl_gcr_8c1dd4afcf0f8ea2_15_double_double)}, + {"nl_gcr_8c1dd4afcf0f8ea2_15_double_double", reinterpret_cast(&nl_gcr_8c1dd4afcf0f8ea2_15_double_double)}, // NOLINT // fireone - {"nl_gcr_8c512fd6a6dabc50_35_double_double", reinterpret_cast(&nl_gcr_8c512fd6a6dabc50_35_double_double)}, + {"nl_gcr_8c512fd6a6dabc50_35_double_double", reinterpret_cast(&nl_gcr_8c512fd6a6dabc50_35_double_double)}, // NOLINT // segausb - {"nl_gcr_8cc4eb213eaeef9b_30_double_double", reinterpret_cast(&nl_gcr_8cc4eb213eaeef9b_30_double_double)}, + {"nl_gcr_8cc4eb213eaeef9b_30_double_double", reinterpret_cast(&nl_gcr_8cc4eb213eaeef9b_30_double_double)}, // NOLINT // starcrus - {"nl_gcr_8d7bddf33d942482_129_double_double", reinterpret_cast(&nl_gcr_8d7bddf33d942482_129_double_double)}, + {"nl_gcr_8d7bddf33d942482_129_double_double", reinterpret_cast(&nl_gcr_8d7bddf33d942482_129_double_double)}, // NOLINT // tank - {"nl_gcr_930b64361c2cdba8_328_double_double", reinterpret_cast(&nl_gcr_930b64361c2cdba8_328_double_double)}, + {"nl_gcr_930b64361c2cdba8_328_double_double", reinterpret_cast(&nl_gcr_930b64361c2cdba8_328_double_double)}, // NOLINT // gamemachine - {"nl_gcr_934712b55bb3b2b2_10_double_double", reinterpret_cast(&nl_gcr_934712b55bb3b2b2_10_double_double)}, + {"nl_gcr_934712b55bb3b2b2_10_double_double", reinterpret_cast(&nl_gcr_934712b55bb3b2b2_10_double_double)}, // NOLINT // kidniki - {"nl_gcr_9a5874c8e2da79d2_37_double_double", reinterpret_cast(&nl_gcr_9a5874c8e2da79d2_37_double_double)}, + {"nl_gcr_9a5874c8e2da79d2_37_double_double", reinterpret_cast(&nl_gcr_9a5874c8e2da79d2_37_double_double)}, // NOLINT // fireone - {"nl_gcr_9aa159329f86ca8b_70_double_double", reinterpret_cast(&nl_gcr_9aa159329f86ca8b_70_double_double)}, + {"nl_gcr_9aa159329f86ca8b_70_double_double", reinterpret_cast(&nl_gcr_9aa159329f86ca8b_70_double_double)}, // NOLINT // warrior - {"nl_gcr_9c975530a1a529d6_7_double_double", reinterpret_cast(&nl_gcr_9c975530a1a529d6_7_double_double)}, + {"nl_gcr_9c975530a1a529d6_7_double_double", reinterpret_cast(&nl_gcr_9c975530a1a529d6_7_double_double)}, // NOLINT // kidniki - {"nl_gcr_9f141889c2091efc_24_double_double", reinterpret_cast(&nl_gcr_9f141889c2091efc_24_double_double)}, + {"nl_gcr_9f141889c2091efc_24_double_double", reinterpret_cast(&nl_gcr_9f141889c2091efc_24_double_double)}, // NOLINT // segas16b_audio - {"nl_gcr_9f7104c5e25c87dd_111_double_double", reinterpret_cast(&nl_gcr_9f7104c5e25c87dd_111_double_double)}, + {"nl_gcr_9f7104c5e25c87dd_111_double_double", reinterpret_cast(&nl_gcr_9f7104c5e25c87dd_111_double_double)}, // NOLINT // boxingb - {"nl_gcr_a0bf548977306172_25_double_double", reinterpret_cast(&nl_gcr_a0bf548977306172_25_double_double)}, + {"nl_gcr_a0bf548977306172_25_double_double", reinterpret_cast(&nl_gcr_a0bf548977306172_25_double_double)}, // NOLINT // boxingb - {"nl_gcr_a1132c8737d5d463_96_double_double", reinterpret_cast(&nl_gcr_a1132c8737d5d463_96_double_double)}, + {"nl_gcr_a1132c8737d5d463_96_double_double", reinterpret_cast(&nl_gcr_a1132c8737d5d463_96_double_double)}, // NOLINT // astrob - {"nl_gcr_a41a44bd5c424f88_13_double_double", reinterpret_cast(&nl_gcr_a41a44bd5c424f88_13_double_double)}, + {"nl_gcr_a41a44bd5c424f88_13_double_double", reinterpret_cast(&nl_gcr_a41a44bd5c424f88_13_double_double)}, // NOLINT // tp1985 - {"nl_gcr_a4540ffea06b4346_26_double_double", reinterpret_cast(&nl_gcr_a4540ffea06b4346_26_double_double)}, + {"nl_gcr_a4540ffea06b4346_26_double_double", reinterpret_cast(&nl_gcr_a4540ffea06b4346_26_double_double)}, // NOLINT // tailg - {"nl_gcr_a46301cd3479b8db_15_double_double", reinterpret_cast(&nl_gcr_a46301cd3479b8db_15_double_double)}, + {"nl_gcr_a46301cd3479b8db_15_double_double", reinterpret_cast(&nl_gcr_a46301cd3479b8db_15_double_double)}, // NOLINT // barrier - {"nl_gcr_a50a4b733e95414a_10_double_double", reinterpret_cast(&nl_gcr_a50a4b733e95414a_10_double_double)}, + {"nl_gcr_a50a4b733e95414a_10_double_double", reinterpret_cast(&nl_gcr_a50a4b733e95414a_10_double_double)}, // NOLINT // starcas - {"nl_gcr_a582a424cb61c678_62_double_double", reinterpret_cast(&nl_gcr_a582a424cb61c678_62_double_double)}, + {"nl_gcr_a582a424cb61c678_62_double_double", reinterpret_cast(&nl_gcr_a582a424cb61c678_62_double_double)}, // NOLINT // tank - {"nl_gcr_a63d1344e34bef4b_36_double_double", reinterpret_cast(&nl_gcr_a63d1344e34bef4b_36_double_double)}, + {"nl_gcr_a63d1344e34bef4b_36_double_double", reinterpret_cast(&nl_gcr_a63d1344e34bef4b_36_double_double)}, // NOLINT // boxingb - {"nl_gcr_a6b734322b3ea924_22_double_double", reinterpret_cast(&nl_gcr_a6b734322b3ea924_22_double_double)}, + {"nl_gcr_a6b734322b3ea924_22_double_double", reinterpret_cast(&nl_gcr_a6b734322b3ea924_22_double_double)}, // NOLINT // armora - {"nl_gcr_a6cfda6668b153c2_22_double_double", reinterpret_cast(&nl_gcr_a6cfda6668b153c2_22_double_double)}, + {"nl_gcr_a6cfda6668b153c2_22_double_double", reinterpret_cast(&nl_gcr_a6cfda6668b153c2_22_double_double)}, // NOLINT // boxingb - {"nl_gcr_a6f74be7f61e6db2_29_double_double", reinterpret_cast(&nl_gcr_a6f74be7f61e6db2_29_double_double)}, + {"nl_gcr_a6f74be7f61e6db2_29_double_double", reinterpret_cast(&nl_gcr_a6f74be7f61e6db2_29_double_double)}, // NOLINT // carpolo - {"nl_gcr_a8f1d076330f06b7_34_double_double", reinterpret_cast(&nl_gcr_a8f1d076330f06b7_34_double_double)}, + {"nl_gcr_a8f1d076330f06b7_34_double_double", reinterpret_cast(&nl_gcr_a8f1d076330f06b7_34_double_double)}, // NOLINT // breakout - {"nl_gcr_a971eeb2ef76f75f_13_double_double", reinterpret_cast(&nl_gcr_a971eeb2ef76f75f_13_double_double)}, + {"nl_gcr_a971eeb2ef76f75f_13_double_double", reinterpret_cast(&nl_gcr_a971eeb2ef76f75f_13_double_double)}, // NOLINT // ripoff - {"nl_gcr_aa07266ef5d420d1_11_double_double", reinterpret_cast(&nl_gcr_aa07266ef5d420d1_11_double_double)}, + {"nl_gcr_aa07266ef5d420d1_11_double_double", reinterpret_cast(&nl_gcr_aa07266ef5d420d1_11_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_ab9144d965a37e4_113_double_double", reinterpret_cast(&nl_gcr_ab9144d965a37e4_113_double_double)}, + {"nl_gcr_ab9144d965a37e4_113_double_double", reinterpret_cast(&nl_gcr_ab9144d965a37e4_113_double_double)}, // NOLINT // sspeedr - {"nl_gcr_ac1e401ddf971e15_10_double_double", reinterpret_cast(&nl_gcr_ac1e401ddf971e15_10_double_double)}, + {"nl_gcr_ac1e401ddf971e15_10_double_double", reinterpret_cast(&nl_gcr_ac1e401ddf971e15_10_double_double)}, // NOLINT // starfire - {"nl_gcr_aceb6035dfb557c9_12_double_double", reinterpret_cast(&nl_gcr_aceb6035dfb557c9_12_double_double)}, + {"nl_gcr_aceb6035dfb557c9_12_double_double", reinterpret_cast(&nl_gcr_aceb6035dfb557c9_12_double_double)}, // NOLINT // sundance - {"nl_gcr_ad6dba01ff2425c3_12_double_double", reinterpret_cast(&nl_gcr_ad6dba01ff2425c3_12_double_double)}, + {"nl_gcr_ad6dba01ff2425c3_12_double_double", reinterpret_cast(&nl_gcr_ad6dba01ff2425c3_12_double_double)}, // NOLINT // rebound - {"nl_gcr_ae15f7f8a55fc96_7_double_double", reinterpret_cast(&nl_gcr_ae15f7f8a55fc96_7_double_double)}, + {"nl_gcr_ae15f7f8a55fc96_7_double_double", reinterpret_cast(&nl_gcr_ae15f7f8a55fc96_7_double_double)}, // NOLINT // armora - {"nl_gcr_afcde432efdafb81_56_double_double", reinterpret_cast(&nl_gcr_afcde432efdafb81_56_double_double)}, + {"nl_gcr_afcde432efdafb81_56_double_double", reinterpret_cast(&nl_gcr_afcde432efdafb81_56_double_double)}, // NOLINT // mario - {"nl_gcr_afce66fb47d3c5f3_62_double_double", reinterpret_cast(&nl_gcr_afce66fb47d3c5f3_62_double_double)}, + {"nl_gcr_afce66fb47d3c5f3_62_double_double", reinterpret_cast(&nl_gcr_afce66fb47d3c5f3_62_double_double)}, // NOLINT // spacewar - {"nl_gcr_b09deef9a25aecaf_24_double_double", reinterpret_cast(&nl_gcr_b09deef9a25aecaf_24_double_double)}, + {"nl_gcr_b09deef9a25aecaf_24_double_double", reinterpret_cast(&nl_gcr_b09deef9a25aecaf_24_double_double)}, // NOLINT // spacfury - {"nl_gcr_b1db23287df1da54_175_double_double", reinterpret_cast(&nl_gcr_b1db23287df1da54_175_double_double)}, + {"nl_gcr_b1db23287df1da54_175_double_double", reinterpret_cast(&nl_gcr_b1db23287df1da54_175_double_double)}, // NOLINT // segaspeech - {"nl_gcr_b22769fbf3159a8d_21_double_double", reinterpret_cast(&nl_gcr_b22769fbf3159a8d_21_double_double)}, + {"nl_gcr_b22769fbf3159a8d_21_double_double", reinterpret_cast(&nl_gcr_b22769fbf3159a8d_21_double_double)}, // NOLINT // breakout - {"nl_gcr_b66ff415b228d5f8_10_double_double", reinterpret_cast(&nl_gcr_b66ff415b228d5f8_10_double_double)}, + {"nl_gcr_b66ff415b228d5f8_10_double_double", reinterpret_cast(&nl_gcr_b66ff415b228d5f8_10_double_double)}, // NOLINT // starcas - {"nl_gcr_b7344e05aac90017_65_double_double", reinterpret_cast(&nl_gcr_b7344e05aac90017_65_double_double)}, + {"nl_gcr_b7344e05aac90017_65_double_double", reinterpret_cast(&nl_gcr_b7344e05aac90017_65_double_double)}, // NOLINT // starfire - {"nl_gcr_b75e0baeb501e907_23_double_double", reinterpret_cast(&nl_gcr_b75e0baeb501e907_23_double_double)}, + {"nl_gcr_b75e0baeb501e907_23_double_double", reinterpret_cast(&nl_gcr_b75e0baeb501e907_23_double_double)}, // NOLINT // spacfury - {"nl_gcr_b7b209d222c0a9a6_91_double_double", reinterpret_cast(&nl_gcr_b7b209d222c0a9a6_91_double_double)}, + {"nl_gcr_b7b209d222c0a9a6_91_double_double", reinterpret_cast(&nl_gcr_b7b209d222c0a9a6_91_double_double)}, // NOLINT // boxingb - {"nl_gcr_b8d6d148a50bdb8f_55_double_double", reinterpret_cast(&nl_gcr_b8d6d148a50bdb8f_55_double_double)}, + {"nl_gcr_b8d6d148a50bdb8f_55_double_double", reinterpret_cast(&nl_gcr_b8d6d148a50bdb8f_55_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_bb501e6a23177009_57_double_double", reinterpret_cast(&nl_gcr_bb501e6a23177009_57_double_double)}, + {"nl_gcr_bb501e6a23177009_57_double_double", reinterpret_cast(&nl_gcr_bb501e6a23177009_57_double_double)}, // NOLINT // elim - {"nl_gcr_bb56fa5325163fc3_15_double_double", reinterpret_cast(&nl_gcr_bb56fa5325163fc3_15_double_double)}, + {"nl_gcr_bb56fa5325163fc3_15_double_double", reinterpret_cast(&nl_gcr_bb56fa5325163fc3_15_double_double)}, // NOLINT // starfire - {"nl_gcr_bd1514d7defd4062_9_double_double", reinterpret_cast(&nl_gcr_bd1514d7defd4062_9_double_double)}, + {"nl_gcr_bd1514d7defd4062_9_double_double", reinterpret_cast(&nl_gcr_bd1514d7defd4062_9_double_double)}, // NOLINT // ripoff - {"nl_gcr_be7c805100c522fd_59_double_double", reinterpret_cast(&nl_gcr_be7c805100c522fd_59_double_double)}, + {"nl_gcr_be7c805100c522fd_59_double_double", reinterpret_cast(&nl_gcr_be7c805100c522fd_59_double_double)}, // NOLINT // elim - {"nl_gcr_be831e5faa508573_150_double_double", reinterpret_cast(&nl_gcr_be831e5faa508573_150_double_double)}, + {"nl_gcr_be831e5faa508573_150_double_double", reinterpret_cast(&nl_gcr_be831e5faa508573_150_double_double)}, // NOLINT // warrior - {"nl_gcr_bff07f8d339f7cc4_89_double_double", reinterpret_cast(&nl_gcr_bff07f8d339f7cc4_89_double_double)}, + {"nl_gcr_bff07f8d339f7cc4_89_double_double", reinterpret_cast(&nl_gcr_bff07f8d339f7cc4_89_double_double)}, // NOLINT // fireone - {"nl_gcr_c1d22fe6e895255d_79_double_double", reinterpret_cast(&nl_gcr_c1d22fe6e895255d_79_double_double)}, + {"nl_gcr_c1d22fe6e895255d_79_double_double", reinterpret_cast(&nl_gcr_c1d22fe6e895255d_79_double_double)}, // NOLINT // starcrus - {"nl_gcr_c2e616f3de30f15b_31_double_double", reinterpret_cast(&nl_gcr_c2e616f3de30f15b_31_double_double)}, + {"nl_gcr_c2e616f3de30f15b_31_double_double", reinterpret_cast(&nl_gcr_c2e616f3de30f15b_31_double_double)}, // NOLINT // tailg - {"nl_gcr_c4cec7aed23b7b94_23_double_double", reinterpret_cast(&nl_gcr_c4cec7aed23b7b94_23_double_double)}, + {"nl_gcr_c4cec7aed23b7b94_23_double_double", reinterpret_cast(&nl_gcr_c4cec7aed23b7b94_23_double_double)}, // NOLINT // segausb - {"nl_gcr_c61e08cf5e35918_84_double_double", reinterpret_cast(&nl_gcr_c61e08cf5e35918_84_double_double)}, + {"nl_gcr_c61e08cf5e35918_84_double_double", reinterpret_cast(&nl_gcr_c61e08cf5e35918_84_double_double)}, // NOLINT // popeye - {"nl_gcr_c6f25bb06e161d1c_50_double_double", reinterpret_cast(&nl_gcr_c6f25bb06e161d1c_50_double_double)}, + {"nl_gcr_c6f25bb06e161d1c_50_double_double", reinterpret_cast(&nl_gcr_c6f25bb06e161d1c_50_double_double)}, // NOLINT // flyball - {"nl_gcr_c74b1a65978d7121_7_double_double", reinterpret_cast(&nl_gcr_c74b1a65978d7121_7_double_double)}, + {"nl_gcr_c74b1a65978d7121_7_double_double", reinterpret_cast(&nl_gcr_c74b1a65978d7121_7_double_double)}, // NOLINT // stuntcyc - {"nl_gcr_c924fe5960b1479e_20_double_double", reinterpret_cast(&nl_gcr_c924fe5960b1479e_20_double_double)}, + {"nl_gcr_c924fe5960b1479e_20_double_double", reinterpret_cast(&nl_gcr_c924fe5960b1479e_20_double_double)}, // NOLINT // dpatrol - {"nl_gcr_ca68d70bd8f2f62e_22_double_double", reinterpret_cast(&nl_gcr_ca68d70bd8f2f62e_22_double_double)}, + {"nl_gcr_ca68d70bd8f2f62e_22_double_double", reinterpret_cast(&nl_gcr_ca68d70bd8f2f62e_22_double_double)}, // NOLINT // breakout - {"nl_gcr_cb2aae3366e0ac1c_7_double_double", reinterpret_cast(&nl_gcr_cb2aae3366e0ac1c_7_double_double)}, + {"nl_gcr_cb2aae3366e0ac1c_7_double_double", reinterpret_cast(&nl_gcr_cb2aae3366e0ac1c_7_double_double)}, // NOLINT // barrier - {"nl_gcr_cc913f9c3f9293e7_19_double_double", reinterpret_cast(&nl_gcr_cc913f9c3f9293e7_19_double_double)}, + {"nl_gcr_cc913f9c3f9293e7_19_double_double", reinterpret_cast(&nl_gcr_cc913f9c3f9293e7_19_double_double)}, // NOLINT // fireone - {"nl_gcr_cca3d1a4219e2ec0_153_double_double", reinterpret_cast(&nl_gcr_cca3d1a4219e2ec0_153_double_double)}, + {"nl_gcr_cca3d1a4219e2ec0_153_double_double", reinterpret_cast(&nl_gcr_cca3d1a4219e2ec0_153_double_double)}, // NOLINT // 1942 - {"nl_gcr_ce766957cb26ff3e_90_double_double", reinterpret_cast(&nl_gcr_ce766957cb26ff3e_90_double_double)}, + {"nl_gcr_ce766957cb26ff3e_90_double_double", reinterpret_cast(&nl_gcr_ce766957cb26ff3e_90_double_double)}, // NOLINT // astrob - {"nl_gcr_cf1018e7ed626623_43_double_double", reinterpret_cast(&nl_gcr_cf1018e7ed626623_43_double_double)}, + {"nl_gcr_cf1018e7ed626623_43_double_double", reinterpret_cast(&nl_gcr_cf1018e7ed626623_43_double_double)}, // NOLINT // zac1b11142 - {"nl_gcr_cfd3bbf5fbba4765_71_double_double", reinterpret_cast(&nl_gcr_cfd3bbf5fbba4765_71_double_double)}, + {"nl_gcr_cfd3bbf5fbba4765_71_double_double", reinterpret_cast(&nl_gcr_cfd3bbf5fbba4765_71_double_double)}, // NOLINT // gunfight - {"nl_gcr_d05b3dbe370c7904_14_double_double", reinterpret_cast(&nl_gcr_d05b3dbe370c7904_14_double_double)}, + {"nl_gcr_d05b3dbe370c7904_14_double_double", reinterpret_cast(&nl_gcr_d05b3dbe370c7904_14_double_double)}, // NOLINT // barrier - {"nl_gcr_d06bd7ddbfd17b5e_15_double_double", reinterpret_cast(&nl_gcr_d06bd7ddbfd17b5e_15_double_double)}, + {"nl_gcr_d06bd7ddbfd17b5e_15_double_double", reinterpret_cast(&nl_gcr_d06bd7ddbfd17b5e_15_double_double)}, // NOLINT // elim - {"nl_gcr_d13f9c6838af6aeb_13_double_double", reinterpret_cast(&nl_gcr_d13f9c6838af6aeb_13_double_double)}, + {"nl_gcr_d13f9c6838af6aeb_13_double_double", reinterpret_cast(&nl_gcr_d13f9c6838af6aeb_13_double_double)}, // NOLINT // elim - {"nl_gcr_d190a0e3b8e1f4a7_7_double_double", reinterpret_cast(&nl_gcr_d190a0e3b8e1f4a7_7_double_double)}, + {"nl_gcr_d190a0e3b8e1f4a7_7_double_double", reinterpret_cast(&nl_gcr_d190a0e3b8e1f4a7_7_double_double)}, // NOLINT // elim - {"nl_gcr_d224211d1af6811d_12_double_double", reinterpret_cast(&nl_gcr_d224211d1af6811d_12_double_double)}, + {"nl_gcr_d224211d1af6811d_12_double_double", reinterpret_cast(&nl_gcr_d224211d1af6811d_12_double_double)}, // NOLINT // armora - {"nl_gcr_d27a39bc93616187_45_double_double", reinterpret_cast(&nl_gcr_d27a39bc93616187_45_double_double)}, + {"nl_gcr_d27a39bc93616187_45_double_double", reinterpret_cast(&nl_gcr_d27a39bc93616187_45_double_double)}, // NOLINT // elim - {"nl_gcr_d2ea3f267b959e8b_20_double_double", reinterpret_cast(&nl_gcr_d2ea3f267b959e8b_20_double_double)}, + {"nl_gcr_d2ea3f267b959e8b_20_double_double", reinterpret_cast(&nl_gcr_d2ea3f267b959e8b_20_double_double)}, // NOLINT // starfire - {"nl_gcr_d32effa2b0ea54a1_438_double_double", reinterpret_cast(&nl_gcr_d32effa2b0ea54a1_438_double_double)}, + {"nl_gcr_d32effa2b0ea54a1_438_double_double", reinterpret_cast(&nl_gcr_d32effa2b0ea54a1_438_double_double)}, // NOLINT // spacfury - {"nl_gcr_d4c34516ff6aa139_46_double_double", reinterpret_cast(&nl_gcr_d4c34516ff6aa139_46_double_double)}, + {"nl_gcr_d4c34516ff6aa139_46_double_double", reinterpret_cast(&nl_gcr_d4c34516ff6aa139_46_double_double)}, // NOLINT // boxingb - {"nl_gcr_d7d45dc58b08cab9_10_double_double", reinterpret_cast(&nl_gcr_d7d45dc58b08cab9_10_double_double)}, + {"nl_gcr_d7d45dc58b08cab9_10_double_double", reinterpret_cast(&nl_gcr_d7d45dc58b08cab9_10_double_double)}, // NOLINT // kidniki - {"nl_gcr_d8c511d38cef5f6f_34_double_double", reinterpret_cast(&nl_gcr_d8c511d38cef5f6f_34_double_double)}, + {"nl_gcr_d8c511d38cef5f6f_34_double_double", reinterpret_cast(&nl_gcr_d8c511d38cef5f6f_34_double_double)}, // NOLINT // warrior - {"nl_gcr_da598f43329e823_27_double_double", reinterpret_cast(&nl_gcr_da598f43329e823_27_double_double)}, + {"nl_gcr_da598f43329e823_27_double_double", reinterpret_cast(&nl_gcr_da598f43329e823_27_double_double)}, // NOLINT // pongf - {"nl_gcr_dbafc5ddaf7a08f8_35_double_double", reinterpret_cast(&nl_gcr_dbafc5ddaf7a08f8_35_double_double)}, + {"nl_gcr_dbafc5ddaf7a08f8_35_double_double", reinterpret_cast(&nl_gcr_dbafc5ddaf7a08f8_35_double_double)}, // NOLINT // fireone - {"nl_gcr_dcbecbc127c5868f_36_double_double", reinterpret_cast(&nl_gcr_dcbecbc127c5868f_36_double_double)}, + {"nl_gcr_dcbecbc127c5868f_36_double_double", reinterpret_cast(&nl_gcr_dcbecbc127c5868f_36_double_double)}, // NOLINT // sundance - {"nl_gcr_e02a162cb515a958_100_double_double", reinterpret_cast(&nl_gcr_e02a162cb515a958_100_double_double)}, + {"nl_gcr_e02a162cb515a958_100_double_double", reinterpret_cast(&nl_gcr_e02a162cb515a958_100_double_double)}, // NOLINT // speedfrk - {"nl_gcr_e07b5b086812756c_7_double_double", reinterpret_cast(&nl_gcr_e07b5b086812756c_7_double_double)}, + {"nl_gcr_e07b5b086812756c_7_double_double", reinterpret_cast(&nl_gcr_e07b5b086812756c_7_double_double)}, // NOLINT // solarq - {"nl_gcr_e081f90c2e0313f6_45_double_double", reinterpret_cast(&nl_gcr_e081f90c2e0313f6_45_double_double)}, + {"nl_gcr_e081f90c2e0313f6_45_double_double", reinterpret_cast(&nl_gcr_e081f90c2e0313f6_45_double_double)}, // NOLINT // spacewar - {"nl_gcr_e0b492db40bba291_20_double_double", reinterpret_cast(&nl_gcr_e0b492db40bba291_20_double_double)}, + {"nl_gcr_e0b492db40bba291_20_double_double", reinterpret_cast(&nl_gcr_e0b492db40bba291_20_double_double)}, // NOLINT // flyball - {"nl_gcr_e15d9316d59cdad9_7_double_double", reinterpret_cast(&nl_gcr_e15d9316d59cdad9_7_double_double)}, + {"nl_gcr_e15d9316d59cdad9_7_double_double", reinterpret_cast(&nl_gcr_e15d9316d59cdad9_7_double_double)}, // NOLINT // speedfrk - {"nl_gcr_e4f2ffbf201a3d0c_37_double_double", reinterpret_cast(&nl_gcr_e4f2ffbf201a3d0c_37_double_double)}, + {"nl_gcr_e4f2ffbf201a3d0c_37_double_double", reinterpret_cast(&nl_gcr_e4f2ffbf201a3d0c_37_double_double)}, // NOLINT // pongf - {"nl_gcr_e51b463cd890ef6d_7_double_double", reinterpret_cast(&nl_gcr_e51b463cd890ef6d_7_double_double)}, + {"nl_gcr_e51b463cd890ef6d_7_double_double", reinterpret_cast(&nl_gcr_e51b463cd890ef6d_7_double_double)}, // NOLINT // sundance - {"nl_gcr_e5b7711fac1ea80c_8_double_double", reinterpret_cast(&nl_gcr_e5b7711fac1ea80c_8_double_double)}, + {"nl_gcr_e5b7711fac1ea80c_8_double_double", reinterpret_cast(&nl_gcr_e5b7711fac1ea80c_8_double_double)}, // NOLINT // ripoff - {"nl_gcr_e60314070a75e121_20_double_double", reinterpret_cast(&nl_gcr_e60314070a75e121_20_double_double)}, + {"nl_gcr_e60314070a75e121_20_double_double", reinterpret_cast(&nl_gcr_e60314070a75e121_20_double_double)}, // NOLINT // cheekyms - {"nl_gcr_e75302e17c866419_150_double_double", reinterpret_cast(&nl_gcr_e75302e17c866419_150_double_double)}, + {"nl_gcr_e75302e17c866419_150_double_double", reinterpret_cast(&nl_gcr_e75302e17c866419_150_double_double)}, // NOLINT // elim - {"nl_gcr_e76692c10e79997e_36_double_double", reinterpret_cast(&nl_gcr_e76692c10e79997e_36_double_double)}, + {"nl_gcr_e76692c10e79997e_36_double_double", reinterpret_cast(&nl_gcr_e76692c10e79997e_36_double_double)}, // NOLINT // fireone - {"nl_gcr_e7fb484f621b3ab9_7_double_double", reinterpret_cast(&nl_gcr_e7fb484f621b3ab9_7_double_double)}, + {"nl_gcr_e7fb484f621b3ab9_7_double_double", reinterpret_cast(&nl_gcr_e7fb484f621b3ab9_7_double_double)}, // NOLINT // elim - {"nl_gcr_e8aeb165b69427ec_18_double_double", reinterpret_cast(&nl_gcr_e8aeb165b69427ec_18_double_double)}, + {"nl_gcr_e8aeb165b69427ec_18_double_double", reinterpret_cast(&nl_gcr_e8aeb165b69427ec_18_double_double)}, // NOLINT // spacewar - {"nl_gcr_e9e8211f43d8f4b3_22_double_double", reinterpret_cast(&nl_gcr_e9e8211f43d8f4b3_22_double_double)}, + {"nl_gcr_e9e8211f43d8f4b3_22_double_double", reinterpret_cast(&nl_gcr_e9e8211f43d8f4b3_22_double_double)}, // NOLINT // boxingb - {"nl_gcr_ea2b6e3a05e6ef0b_23_double_double", reinterpret_cast(&nl_gcr_ea2b6e3a05e6ef0b_23_double_double)}, + {"nl_gcr_ea2b6e3a05e6ef0b_23_double_double", reinterpret_cast(&nl_gcr_ea2b6e3a05e6ef0b_23_double_double)}, // NOLINT // starcas - {"nl_gcr_ec4f6d2dad5961b9_64_double_double", reinterpret_cast(&nl_gcr_ec4f6d2dad5961b9_64_double_double)}, + {"nl_gcr_ec4f6d2dad5961b9_64_double_double", reinterpret_cast(&nl_gcr_ec4f6d2dad5961b9_64_double_double)}, // NOLINT // barrier - {"nl_gcr_ecf17036ce1c07cf_10_double_double", reinterpret_cast(&nl_gcr_ecf17036ce1c07cf_10_double_double)}, + {"nl_gcr_ecf17036ce1c07cf_10_double_double", reinterpret_cast(&nl_gcr_ecf17036ce1c07cf_10_double_double)}, // NOLINT // armora - {"nl_gcr_ee2cacaa15d32491_67_double_double", reinterpret_cast(&nl_gcr_ee2cacaa15d32491_67_double_double)}, + {"nl_gcr_ee2cacaa15d32491_67_double_double", reinterpret_cast(&nl_gcr_ee2cacaa15d32491_67_double_double)}, // NOLINT // astrob - {"nl_gcr_ee61dcaa355fc625_285_double_double", reinterpret_cast(&nl_gcr_ee61dcaa355fc625_285_double_double)}, + {"nl_gcr_ee61dcaa355fc625_285_double_double", reinterpret_cast(&nl_gcr_ee61dcaa355fc625_285_double_double)}, // NOLINT // starcrus - {"nl_gcr_ef2f49641f433a74_94_double_double", reinterpret_cast(&nl_gcr_ef2f49641f433a74_94_double_double)}, + {"nl_gcr_ef2f49641f433a74_94_double_double", reinterpret_cast(&nl_gcr_ef2f49641f433a74_94_double_double)}, // NOLINT // spacfury - {"nl_gcr_f365c3863b050e35_45_double_double", reinterpret_cast(&nl_gcr_f365c3863b050e35_45_double_double)}, + {"nl_gcr_f365c3863b050e35_45_double_double", reinterpret_cast(&nl_gcr_f365c3863b050e35_45_double_double)}, // NOLINT // spacfury - {"nl_gcr_f3c9a6d53371d709_227_double_double", reinterpret_cast(&nl_gcr_f3c9a6d53371d709_227_double_double)}, + {"nl_gcr_f3c9a6d53371d709_227_double_double", reinterpret_cast(&nl_gcr_f3c9a6d53371d709_227_double_double)}, // NOLINT // barrier - {"nl_gcr_f425d4008ae1d2c6_13_double_double", reinterpret_cast(&nl_gcr_f425d4008ae1d2c6_13_double_double)}, + {"nl_gcr_f425d4008ae1d2c6_13_double_double", reinterpret_cast(&nl_gcr_f425d4008ae1d2c6_13_double_double)}, // NOLINT // boxingb - {"nl_gcr_f43cf2a28a5a5561_23_double_double", reinterpret_cast(&nl_gcr_f43cf2a28a5a5561_23_double_double)}, + {"nl_gcr_f43cf2a28a5a5561_23_double_double", reinterpret_cast(&nl_gcr_f43cf2a28a5a5561_23_double_double)}, // NOLINT // spacfury - {"nl_gcr_f4da1503eabe16cf_16_double_double", reinterpret_cast(&nl_gcr_f4da1503eabe16cf_16_double_double)}, + {"nl_gcr_f4da1503eabe16cf_16_double_double", reinterpret_cast(&nl_gcr_f4da1503eabe16cf_16_double_double)}, // NOLINT // elim - {"nl_gcr_f4f4e2ee05cb584e_13_double_double", reinterpret_cast(&nl_gcr_f4f4e2ee05cb584e_13_double_double)}, + {"nl_gcr_f4f4e2ee05cb584e_13_double_double", reinterpret_cast(&nl_gcr_f4f4e2ee05cb584e_13_double_double)}, // NOLINT // konami2x - {"nl_gcr_f6900d3f36a91049_85_double_double", reinterpret_cast(&nl_gcr_f6900d3f36a91049_85_double_double)}, + {"nl_gcr_f6900d3f36a91049_85_double_double", reinterpret_cast(&nl_gcr_f6900d3f36a91049_85_double_double)}, // NOLINT // breakout - {"nl_gcr_f7dc4f87b5a8ba93_7_double_double", reinterpret_cast(&nl_gcr_f7dc4f87b5a8ba93_7_double_double)}, + {"nl_gcr_f7dc4f87b5a8ba93_7_double_double", reinterpret_cast(&nl_gcr_f7dc4f87b5a8ba93_7_double_double)}, // NOLINT // fireone - {"nl_gcr_f8f6a951fd1af6bc_7_double_double", reinterpret_cast(&nl_gcr_f8f6a951fd1af6bc_7_double_double)}, + {"nl_gcr_f8f6a951fd1af6bc_7_double_double", reinterpret_cast(&nl_gcr_f8f6a951fd1af6bc_7_double_double)}, // NOLINT // zektor - {"nl_gcr_fbff020f5f5d5a5_144_double_double", reinterpret_cast(&nl_gcr_fbff020f5f5d5a5_144_double_double)}, + {"nl_gcr_fbff020f5f5d5a5_144_double_double", reinterpret_cast(&nl_gcr_fbff020f5f5d5a5_144_double_double)}, // NOLINT // kidniki - {"nl_gcr_fc02559fdbfb0e10_67_double_double", reinterpret_cast(&nl_gcr_fc02559fdbfb0e10_67_double_double)}, + {"nl_gcr_fc02559fdbfb0e10_67_double_double", reinterpret_cast(&nl_gcr_fc02559fdbfb0e10_67_double_double)}, // NOLINT // 280zzzap - {"nl_gcr_fc9971724787b82b_149_double_double", reinterpret_cast(&nl_gcr_fc9971724787b82b_149_double_double)}, + {"nl_gcr_fc9971724787b82b_149_double_double", reinterpret_cast(&nl_gcr_fc9971724787b82b_149_double_double)}, // NOLINT // elim - {"nl_gcr_fcce97532ad2f49d_18_double_double", reinterpret_cast(&nl_gcr_fcce97532ad2f49d_18_double_double)}, + {"nl_gcr_fcce97532ad2f49d_18_double_double", reinterpret_cast(&nl_gcr_fcce97532ad2f49d_18_double_double)}, // NOLINT // fireone - {"nl_gcr_fd2796828f1ebd00_36_double_double", reinterpret_cast(&nl_gcr_fd2796828f1ebd00_36_double_double)}, + {"nl_gcr_fd2796828f1ebd00_36_double_double", reinterpret_cast(&nl_gcr_fd2796828f1ebd00_36_double_double)}, // NOLINT // starfire - {"nl_gcr_feae15b80dd73620_7_double_double", reinterpret_cast(&nl_gcr_feae15b80dd73620_7_double_double)}, + {"nl_gcr_feae15b80dd73620_7_double_double", reinterpret_cast(&nl_gcr_feae15b80dd73620_7_double_double)}, // NOLINT #endif {"", nullptr} diff --git a/src/lib/netlist/plib/parray.h b/src/lib/netlist/plib/parray.h index 61220366775..54d72484ac2 100644 --- a/src/lib/netlist/plib/parray.h +++ b/src/lib/netlist/plib/parray.h @@ -105,12 +105,9 @@ namespace plib { { } - // osx clang doesn't like COPYASSIGNMOVE(parray, default) - // it will generate some weird error messages about move assignment - // constructor having a different noexcept status. - parray(const parray &rhs) : m_a(rhs.m_a), m_size(rhs.m_size) {} parray(parray &&rhs) noexcept : m_a(std::move(rhs.m_a)), m_size(std::move(rhs.m_size)) {} + parray &operator=(const parray &rhs) noexcept // NOLINT(bugprone-unhandled-self-assignment, cert-oop54-cpp) { if (this == &rhs) @@ -135,11 +132,11 @@ namespace plib { constexpr reference operator[](size_type i) noexcept { - return data()[i]; + return m_a[i]; } constexpr const_reference operator[](size_type i) const noexcept { - return data()[i]; + return m_a[i]; } pointer data() noexcept { return m_a.data(); } @@ -157,6 +154,7 @@ namespace plib { public: using size_type = std::size_t; + using base_type = parray, SIZE1>; parray2D(size_type size1, size_type size2) : parray, SIZE1>(size1) @@ -168,7 +166,10 @@ namespace plib { } } - PCOPYASSIGNMOVE(parray2D, default) + parray2D(const parray2D &) = default; + parray2D &operator=(const parray2D &) = default; + parray2D(parray2D &&) noexcept(std::is_nothrow_move_constructible::value) = default; + parray2D &operator=(parray2D &&) noexcept(std::is_nothrow_move_assignable::value) = default; ~parray2D() noexcept = default; diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h index 694099936b9..ce06fd7b55d 100644 --- a/src/lib/netlist/plib/pchrono.h +++ b/src/lib/netlist/plib/pchrono.h @@ -194,32 +194,32 @@ namespace plib { struct guard_t { guard_t() = delete; - explicit guard_t(timer &m) noexcept : m_m(m) { m_m.m_time -= T::start(); } + explicit constexpr guard_t(timer &m) noexcept : m_m(m) { m_m.m_time -= T::start(); } ~guard_t() noexcept { m_m.m_time += T::stop(); ++m_m.m_count; } - guard_t(const guard_t &) = default; - guard_t &operator=(const guard_t &) = default; - guard_t(guard_t &&) noexcept = default; - guard_t &operator=(guard_t &&) noexcept = default; + constexpr guard_t(const guard_t &) = default; + constexpr guard_t &operator=(const guard_t &) = default; + constexpr guard_t(guard_t &&) noexcept = default; + constexpr guard_t &operator=(guard_t &&) noexcept = default; private: timer &m_m; }; - timer() : m_time(0), m_count(0) { } + constexpr timer() : m_time(0), m_count(0) { } - type operator()() const { return m_time; } + constexpr type operator()() const { return m_time; } void reset() noexcept { m_time = 0; m_count = 0; } - type average() const noexcept { return (m_count == 0) ? 0 : m_time / m_count; } - type total() const noexcept { return m_time; } - ctype count() const noexcept { return m_count; } + constexpr type average() const noexcept { return (m_count == 0) ? 0 : m_time / m_count; } + constexpr type total() const noexcept { return m_time; } + constexpr ctype count() const noexcept { return m_count; } template - S as_seconds() const noexcept { return narrow_cast(total()) + constexpr S as_seconds() const noexcept { return narrow_cast(total()) / narrow_cast(T::per_second()); } - guard_t guard() noexcept { return guard_t(*this); } + constexpr guard_t guard() noexcept { return guard_t(*this); } // pause must be followed by cont(inue) void stop() noexcept { m_time += T::stop(); } @@ -239,12 +239,12 @@ namespace plib { struct guard_t { - guard_t() = default; + constexpr guard_t() = default; - guard_t(const guard_t &) = default; - guard_t &operator=(const guard_t &) = default; - guard_t(guard_t &&) noexcept = default; - guard_t &operator=(guard_t &&) noexcept = default; + constexpr guard_t(const guard_t &) = default; + constexpr guard_t &operator=(const guard_t &) = default; + constexpr guard_t(guard_t &&) noexcept = default; + constexpr guard_t &operator=(guard_t &&) noexcept = default; // using default constructor will trigger warning on // unused local variable. @@ -259,7 +259,7 @@ namespace plib { constexpr type total() const noexcept { return 0; } constexpr ctype count() const noexcept { return 0; } template - S as_seconds() const noexcept { return narrow_cast(0); } + constexpr S as_seconds() const noexcept { return narrow_cast(0); } constexpr static bool enabled = false; guard_t guard() { return guard_t(); } }; diff --git a/src/lib/netlist/plib/pexception.cpp b/src/lib/netlist/plib/pexception.cpp index 0b8b96faed9..d974c6b9a4e 100644 --- a/src/lib/netlist/plib/pexception.cpp +++ b/src/lib/netlist/plib/pexception.cpp @@ -102,7 +102,7 @@ namespace plib { } - bool fpsignalenabler::m_enable = false; + bool fpsignalenabler::m_enable = false; // NOLINT //FIXME: mingw needs to be compiled with "-fnon-call-exceptions" diff --git a/src/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h index 7c5cf233306..efed23d6178 100644 --- a/src/lib/netlist/plib/pexception.h +++ b/src/lib/netlist/plib/pexception.h @@ -125,7 +125,7 @@ namespace plib { private: int m_last_enabled; - static bool m_enable; + static bool m_enable; // NOLINT }; diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 733de4fddc2..fd04f58bc73 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -451,7 +451,7 @@ namespace plib { fatal(logger) {} - PCOPYASSIGNMOVE(plog_base, default) + PCOPYASSIGNMOVE(plog_base, delete) virtual ~plog_base() noexcept = default; plog_channel debug; diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index c424c483449..0cf4fc4cdc2 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -118,7 +118,7 @@ namespace plib { auto p = pcmds().find(cmd); if (p != pcmds().end()) { - rc.m_cmd = p->second.cmd; + rc = rpn_inst(p->second.cmd); stk -= p->second.adj; } else @@ -127,23 +127,20 @@ namespace plib { { if (inputs[i] == cmd) { - rc.m_cmd = PUSH_INPUT; - rc.m_param.index = i; + rc = rpn_inst(PUSH_INPUT, i); stk += 1; break; } } - if (rc.m_cmd != PUSH_INPUT) + if (rc.cmd() != PUSH_INPUT) { - using fl_t = decltype(rc.m_param.val); - rc.m_cmd = PUSH_CONST; bool err(false); auto rs(plib::right(cmd,1)); - auto r=units_si().find(rs); - if (r == units_si().end()) - rc.m_param.val = plib::pstonum_ne(cmd, err); + auto r=units_si().find(rs); + if (r == units_si().end()) + rc = rpn_inst(plib::pstonum_ne(cmd, err)); else - rc.m_param.val = plib::pstonum_ne(plib::left(cmd, cmd.length()-1), err) * r->second; + rc = rpn_inst(plib::pstonum_ne(plib::left(cmd, cmd.length()-1), err) * r->second); if (err) throw pexception(plib::pfmt("pfunction: unknown/misformatted token <{1}> in <{2}>")(cmd)(expr)); stk += 1; @@ -358,13 +355,13 @@ namespace plib { template NT pfunction::evaluate(const values_container &values) noexcept { - std::array stack; + std::array stack; // NOLINT value_type *ptr = stack.data(); constexpr const auto zero = plib::constants::zero(); constexpr const auto one = plib::constants::one(); for (const auto &rc : m_precompiled) { - switch (rc.m_cmd) + switch (rc.cmd()) { OP(ADD, 1, ST2 + ST1) OP(MULT, 1, ST2 * ST1) @@ -386,8 +383,8 @@ namespace plib { OP(MIN, 1, std::min(ST2, ST1)) OP(TRUNC, 0, plib::trunc(ST2)) OP0(RAND, lfsr_random(m_lfsr)) - OP0(PUSH_INPUT, values[rc.m_param.index]) - OP0(PUSH_CONST, rc.m_param.val) + OP0(PUSH_INPUT, values[rc.index()]) + OP0(PUSH_CONST, rc.value()) // please compiler case LP: case RP: @@ -403,22 +400,22 @@ namespace plib { #undef OP #undef OP0 -#define ST0 m_precompiled[ptr+0].m_param.val -#define ST1 m_precompiled[ptr-1].m_param.val -#define ST2 m_precompiled[ptr-2].m_param.val +#define ST0 m_precompiled[ptr+0].value() +#define ST1 m_precompiled[ptr-1].value() +#define ST2 m_precompiled[ptr-2].value() #define OP(OP, ADJ, EXPR) \ case OP: \ if (ADJ == 2) {\ - if (m_precompiled[ptr-3].m_cmd == PUSH_CONST && m_precompiled[ptr-2].m_cmd == PUSH_CONST && m_precompiled[ptr-1].m_cmd == PUSH_CONST) \ + if (m_precompiled[ptr-3].cmd() == PUSH_CONST && m_precompiled[ptr-2].cmd() == PUSH_CONST && m_precompiled[ptr-1].cmd() == PUSH_CONST) \ { ptr--; m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 3; ptr++; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-2)); ptr-=2;} \ else { ptr++; } \ } else if (ADJ == 1) {\ - if (m_precompiled[ptr-2].m_cmd == PUSH_CONST && m_precompiled[ptr-1].m_cmd == PUSH_CONST) \ + if (m_precompiled[ptr-2].cmd() == PUSH_CONST && m_precompiled[ptr-1].cmd() == PUSH_CONST) \ { m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 2; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-1)); ptr--;} \ else { ptr++; } \ } else if (ADJ == 0) {\ - if (m_precompiled[ptr-1].m_cmd == PUSH_CONST) \ + if (m_precompiled[ptr-1].cmd() == PUSH_CONST) \ { ptr++; m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 1; ptr--; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr)); } \ else { ptr++; } \ } else ptr++; \ @@ -438,7 +435,7 @@ namespace plib { auto n = m_precompiled.size(); for (; ptr < n; ) { - switch (m_precompiled[ptr].m_cmd) + switch (m_precompiled[ptr].cmd()) { OP(ADD, 1, ST2 + ST1) OP(MULT, 1, ST2 * ST1) @@ -460,8 +457,8 @@ namespace plib { OP(MIN, 1, std::min(ST2, ST1)) OP(TRUNC, 0, plib::trunc(ST2)) OP0(RAND, lfsr_random(m_lfsr)) - OP0(PUSH_INPUT, values[rc.m_param.index]) - OP0(PUSH_CONST, rc.m_param.val) + OP0(PUSH_INPUT, values[rc.index()]) + OP0(PUSH_CONST, rc.value()) // please compiler case LP: case RP: diff --git a/src/lib/netlist/plib/pfunction.h b/src/lib/netlist/plib/pfunction.h index d694cbe6a89..9c2450d427c 100644 --- a/src/lib/netlist/plib/pfunction.h +++ b/src/lib/netlist/plib/pfunction.h @@ -58,14 +58,32 @@ namespace plib { { struct rpn_inst { - rpn_inst() : m_cmd(ADD) + constexpr rpn_inst() : m_cmd(ADD) { m_param.val = plib::constants::zero(); } - rpn_inst(NT v) : m_cmd(PUSH_CONST) + constexpr rpn_inst(rpn_cmd cmd, std::size_t index = 0) + : m_cmd(cmd) + { + m_param.index = index; + } + constexpr rpn_inst(NT v) : m_cmd(PUSH_CONST) { m_param.val = v; } + constexpr const rpn_cmd &cmd() const noexcept + { + return m_cmd; + } + constexpr const NT &value() const noexcept + { + return m_param.val; // NOLINT + } + constexpr const std::size_t &index() const noexcept + { + return m_param.index; // NOLINT + } + private: rpn_cmd m_cmd; union { diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h index 19c34717126..0d4ab4b0939 100755 --- a/src/lib/netlist/plib/plists.h +++ b/src/lib/netlist/plib/plists.h @@ -187,7 +187,10 @@ namespace plib { constexpr element_t() : m_next(nullptr), m_prev(nullptr) {} ~element_t() noexcept = default; - PCOPYASSIGNMOVE(element_t, default) + element_t(const element_t &) = default; \ + element_t &operator=(const element_t &) = default; + element_t(element_t &&) noexcept = default; + element_t &operator=(element_t &&) noexcept = default; constexpr LC * &next() noexcept { return m_next; } constexpr LC * &prev() noexcept { return m_prev; } diff --git a/src/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h index d0fbac26194..9b40d683f2d 100755 --- a/src/lib/netlist/plib/pmatrix2d.h +++ b/src/lib/netlist/plib/pmatrix2d.h @@ -157,7 +157,11 @@ namespace plib m_v.resize(N); //FIXME } - PCOPYASSIGNMOVE(pmatrix2d_vrl, default) + pmatrix2d_vrl(const pmatrix2d_vrl &) = default; + pmatrix2d_vrl &operator=(const pmatrix2d_vrl &) = default; + pmatrix2d_vrl(pmatrix2d_vrl &&) noexcept = default; + pmatrix2d_vrl &operator=(pmatrix2d_vrl &&) noexcept = default; + ~pmatrix2d_vrl() = default; void resize(size_type N, size_type M) diff --git a/src/lib/netlist/plib/pmatrix_cr.h b/src/lib/netlist/plib/pmatrix_cr.h index 38457650e5e..66d665f3966 100644 --- a/src/lib/netlist/plib/pmatrix_cr.h +++ b/src/lib/netlist/plib/pmatrix_cr.h @@ -35,7 +35,10 @@ namespace plib static constexpr const int NSQ = (N < 0 ? -N * N : N * N); static constexpr const int Np1 = (N == 0) ? 0 : (N < 0 ? N - 1 : N + 1); - PCOPYASSIGNMOVE(pmatrix_cr, default) + pmatrix_cr(const pmatrix_cr &) = default; + pmatrix_cr &operator=(const pmatrix_cr &) = default; + pmatrix_cr(pmatrix_cr &&) noexcept(std::is_nothrow_move_constructible>::value) = default; + pmatrix_cr &operator=(pmatrix_cr &&) noexcept(std::is_nothrow_move_assignable>::value) = default; enum constants_e { @@ -243,10 +246,13 @@ namespace plib template struct pGEmatrix_cr : public B { - using base = B; - using index_type = typename base::index_type; + using base_type = B; + using index_type = typename base_type::index_type; - PCOPYASSIGNMOVE(pGEmatrix_cr, default) + pGEmatrix_cr(const pGEmatrix_cr &) = default; + pGEmatrix_cr &operator=(const pGEmatrix_cr &) = default; + pGEmatrix_cr(pGEmatrix_cr &&) noexcept(std::is_nothrow_move_constructible::value) = default; + pGEmatrix_cr &operator=(pGEmatrix_cr &&) noexcept(std::is_nothrow_move_assignable::value) = default; explicit pGEmatrix_cr(std::size_t n) : B(n) @@ -266,14 +272,14 @@ namespace plib ops++; // 1/A(k,k) for (std::size_t row = k + 1; row < fill.size(); row++) { - if (fill[row][k] < base::FILL_INFINITY) + if (fill[row][k] < base_type::FILL_INFINITY) { ops++; for (std::size_t col = k + 1; col < fill[row].size(); col++) //if (fill[k][col] < FILL_INFINITY) { auto f = std::min(fill[row][col], 1 + fill[row][k] + fill[k][col]); - if (f < base::FILL_INFINITY) + if (f < base_type::FILL_INFINITY) { if (f > fill_max) fill_max = f; @@ -291,37 +297,37 @@ namespace plib template void gaussian_elimination(V & RHS) { - const std::size_t iN = base::size(); + const std::size_t iN = base_type::size(); for (std::size_t i = 0; i < iN - 1; i++) { std::size_t nzbdp = 0; - std::size_t pi = base::diag[i]; - auto f = reciprocal(base::A[pi++]); - const std::size_t piie = base::row_idx[i+1]; + std::size_t pi = base_type::diag[i]; + auto f = reciprocal(base_type::A[pi++]); + const std::size_t piie = base_type::row_idx[i+1]; - const auto *nz = base::m_nzbd[i]; + const auto *nz = base_type::m_nzbd[i]; while (auto j = nz[nzbdp++]) // NOLINT(bugprone-infinite-loop) { // proceed to column i - std::size_t pj = base::row_idx[j]; - std::size_t pje = base::row_idx[j+1]; + std::size_t pj = base_type::row_idx[j]; + std::size_t pje = base_type::row_idx[j+1]; - while (base::col_idx[pj] < i) + while (base_type::col_idx[pj] < i) pj++; - const typename base::value_type f1 = - base::A[pj++] * f; + const typename base_type::value_type f1 = - base_type::A[pj++] * f; // subtract row i from j // fill-in available assumed, i.e. matrix was prepared for (std::size_t pii = pi; pii void gaussian_back_substitution(V1 &V, const V2 &RHS) { - const std::size_t iN = base::size(); + const std::size_t iN = base_type::size(); // row n-1 - V[iN - 1] = RHS[iN - 1] / base::A[base::diag[iN - 1]]; + V[iN - 1] = RHS[iN - 1] / base_type::A[base_type::diag[iN - 1]]; for (std::size_t j = iN - 1; j-- > 0;) { - typename base::value_type tmp = 0; - const auto jdiag = base::diag[j]; - const std::size_t e = base::row_idx[j+1]; + typename base_type::value_type tmp = 0; + const auto jdiag = base_type::diag[j]; + const std::size_t e = base_type::row_idx[j+1]; for (std::size_t pk = jdiag + 1; pk < e; pk++) - tmp += base::A[pk] * V[base::col_idx[pk]]; - V[j] = (RHS[j] - tmp) / base::A[jdiag]; + tmp += base_type::A[pk] * V[base_type::col_idx[pk]]; + V[j] = (RHS[j] - tmp) / base_type::A[jdiag]; } } template void gaussian_back_substitution(V1 &V) { - const std::size_t iN = base::size(); + const std::size_t iN = base_type::size(); // row n-1 - V[iN - 1] = V[iN - 1] / base::A[base::diag[iN - 1]]; + V[iN - 1] = V[iN - 1] / base_type::A[base_type::diag[iN - 1]]; for (std::size_t j = iN - 1; j-- > 0;) { - typename base::value_type tmp = 0; - const auto jdiag = base::diag[j]; - const std::size_t e = base::row_idx[j+1]; + typename base_type::value_type tmp = 0; + const auto jdiag = base_type::diag[j]; + const std::size_t e = base_type::row_idx[j+1]; for (std::size_t pk = jdiag + 1; pk < e; pk++) - tmp += base::A[pk] * V[base::col_idx[pk]]; - V[j] = (V[j] - tmp) / base::A[jdiag]; + tmp += base_type::A[pk] * V[base_type::col_idx[pk]]; + V[j] = (V[j] - tmp) / base_type::A[jdiag]; } } @@ -419,27 +425,27 @@ namespace plib void build_parallel_gaussian_execution_scheme(const M &fill) { // calculate parallel scheme for gaussian elimination - std::vector> rt(base::size()); - for (std::size_t k = 0; k < base::size(); k++) + std::vector> rt(base_type::size()); + for (std::size_t k = 0; k < base_type::size(); k++) { - for (std::size_t j = k+1; j < base::size(); j++) + for (std::size_t j = k+1; j < base_type::size(); j++) { - if (fill[j][k] < base::FILL_INFINITY) + if (fill[j][k] < base_type::FILL_INFINITY) { rt[k].push_back(j); } } } - std::vector levGE(base::size(), 0); + std::vector levGE(base_type::size(), 0); std::size_t cl = 0; - for (std::size_t k = 0; k < base::size(); k++ ) + for (std::size_t k = 0; k < base_type::size(); k++ ) { if (levGE[k] >= cl) { std::vector t = rt[k]; - for (std::size_t j = k+1; j < base::size(); j++ ) + for (std::size_t j = k+1; j < base_type::size(); j++ ) { bool overlap = false; // is there overlap @@ -466,7 +472,7 @@ namespace plib m_ge_par.clear(); m_ge_par.resize(cl+1); - for (std::size_t k = 0; k < base::size(); k++) + for (std::size_t k = 0; k < base_type::size(); k++) m_ge_par[levGE[k]].push_back(k); //for (std::size_t k = 0; k < m_ge_par.size(); k++) // printf("%d %d\n", (int) k, (int) m_ge_par[k].size()); @@ -477,10 +483,13 @@ namespace plib template struct pLUmatrix_cr : public B { - using base = B; - using index_type = typename base::index_type; + using base_type = B; + using index_type = typename base_type::index_type; - PCOPYASSIGNMOVE(pLUmatrix_cr, default) + pLUmatrix_cr(const pLUmatrix_cr &) = default; + pLUmatrix_cr &operator=(const pLUmatrix_cr &) = default; + pLUmatrix_cr(pLUmatrix_cr &&) noexcept(std::is_nothrow_move_constructible::value) = default; + pLUmatrix_cr &operator=(pLUmatrix_cr &&) noexcept(std::is_nothrow_move_assignable::value) = default; explicit pLUmatrix_cr(std::size_t n) : B(n) @@ -539,7 +548,7 @@ namespace plib /// k=k+1 /// i=i+1 /// - void incomplete_LU_factorization(const base &mat) + void incomplete_LU_factorization(const base_type &mat) { if (m_ILUp < 1) this->raw_copy_from(mat); @@ -549,27 +558,27 @@ namespace plib std::size_t p(0); while (auto i = ilu_rows[p++]) // NOLINT(bugprone-infinite-loop) { - const auto p_i_end = base::row_idx[i + 1]; + const auto p_i_end = base_type::row_idx[i + 1]; // loop over all columns k left of diag in row i //if (row_idx[i] < diag[i]) // printf("occ %d\n", (int)i); - for (auto i_k = base::row_idx[i]; i_k < base::diag[i]; i_k++) + for (auto i_k = base_type::row_idx[i]; i_k < base_type::diag[i]; i_k++) { - const auto k(base::col_idx[i_k]); - const auto p_k_end(base::row_idx[k + 1]); - const typename base::value_type LUp_i_k = base::A[i_k] = base::A[i_k] / base::A[base::diag[k]]; + const auto k(base_type::col_idx[i_k]); + const auto p_k_end(base_type::row_idx[k + 1]); + const typename base_type::value_type LUp_i_k = base_type::A[i_k] = base_type::A[i_k] / base_type::A[base_type::diag[k]]; - std::size_t k_j(base::diag[k] + 1); + std::size_t k_j(base_type::diag[k] + 1); std::size_t i_j(i_k + 1); while (i_j < p_i_end && k_j < p_k_end ) // pj = (i, j) { // we can assume that within a row ja increases continuously - const std::size_t c_i_j(base::col_idx[i_j]); // row i, column j - const auto c_k_j(base::col_idx[k_j]); // row k, column j + const std::size_t c_i_j(base_type::col_idx[i_j]); // row i, column j + const auto c_k_j(base_type::col_idx[k_j]); // row k, column j if (c_k_j == c_i_j) - base::A[i_j] -= LUp_i_k * base::A[k_j]; + base_type::A[i_j] -= LUp_i_k * base_type::A[k_j]; k_j += (c_k_j <= c_i_j ? 1 : 0); i_j += (c_k_j >= c_i_j ? 1 : 0); @@ -604,29 +613,29 @@ namespace plib template void solveLU (R &r) { - for (std::size_t i = 1; i < base::size(); ++i ) + for (std::size_t i = 1; i < base_type::size(); ++i ) { - typename base::value_type tmp(0); - const auto j1(base::row_idx[i]); - const auto j2(base::diag[i]); + typename base_type::value_type tmp(0); + const auto j1(base_type::row_idx[i]); + const auto j2(base_type::diag[i]); for (auto j = j1; j < j2; ++j ) - tmp += base::A[j] * r[base::col_idx[j]]; + tmp += base_type::A[j] * r[base_type::col_idx[j]]; r[i] -= tmp; } // i now is equal to n; - for (std::size_t i = base::size(); i-- > 0; ) + for (std::size_t i = base_type::size(); i-- > 0; ) { - typename base::value_type tmp(0); - const auto di(base::diag[i]); - const auto j2(base::row_idx[i+1]); + typename base_type::value_type tmp(0); + const auto di(base_type::diag[i]); + const auto j2(base_type::row_idx[i+1]); for (std::size_t j = di + 1; j < j2; j++ ) - tmp += base::A[j] * r[base::col_idx[j]]; - r[i] = (r[i] - tmp) / base::A[di]; + tmp += base_type::A[j] * r[base_type::col_idx[j]]; + r[i] = (r[i] - tmp) / base_type::A[di]; } } private: - parray ilu_rows; + parray ilu_rows; std::size_t m_ILUp; }; diff --git a/src/lib/netlist/plib/pmempool.h b/src/lib/netlist/plib/pmempool.h index 4e678cb09d6..b83f08e0f49 100644 --- a/src/lib/netlist/plib/pmempool.h +++ b/src/lib/netlist/plib/pmempool.h @@ -168,8 +168,11 @@ namespace plib { struct info { info(block *b, size_type p) : m_block(b), m_pos(p) { } + info(const info &) = default; + info &operator=(const info &) = default; + info(info &&) noexcept = default; + info &operator=(info &&) noexcept = default; ~info() = default; - PCOPYASSIGNMOVE(info, default) block * m_block; size_type m_pos; diff --git a/src/lib/netlist/plib/prandom.h b/src/lib/netlist/plib/prandom.h index b2f9c89a9cf..669228f23fe 100644 --- a/src/lib/netlist/plib/prandom.h +++ b/src/lib/netlist/plib/prandom.h @@ -101,7 +101,7 @@ namespace plib } private: - void twist() + void twist() noexcept { const T lowest_w(~T(0) >> (sizeof(T)*8 - w)); const T lower_mask((T(1) << r) - 1); // That is, the binary number of r 1's @@ -121,10 +121,10 @@ namespace plib }; template - FT normalize_uniform(T &p, FT m = constants::one(), FT b = constants::zero()) + FT normalize_uniform(T &p, FT m = constants::one(), FT b = constants::zero()) noexcept { - const auto mmin(narrow_cast(p.min())); - const auto mmax(narrow_cast(p.max())); + constexpr const auto mmin(narrow_cast(T::min())); + constexpr const auto mmax(narrow_cast(T::max())); // -> 0 to a return (narrow_cast(p())- mmin) / (mmax - mmin) * m - b; } diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h index 231d75e9ebb..bdbcb34b099 100644 --- a/src/lib/netlist/plib/pstream.h +++ b/src/lib/netlist/plib/pstream.h @@ -64,7 +64,7 @@ namespace plib { } istream_uptr(const istream_uptr &) = delete; istream_uptr &operator=(const istream_uptr &) = delete; - istream_uptr(istream_uptr &&rhs) + istream_uptr(istream_uptr &&rhs) noexcept { m_strm = std::move(rhs.m_strm); m_filename = std::move(rhs.m_filename); diff --git a/src/lib/netlist/plib/ptimed_queue.h b/src/lib/netlist/plib/ptimed_queue.h index 1807625b6b3..6d8858a86ba 100644 --- a/src/lib/netlist/plib/ptimed_queue.h +++ b/src/lib/netlist/plib/ptimed_queue.h @@ -38,7 +38,10 @@ namespace plib { constexpr pqentry_t() noexcept : m_exec_time(), m_object(nullptr) { } constexpr pqentry_t(const Time &t, const Element &o) noexcept : m_exec_time(t), m_object(o) { } - PCOPYASSIGNMOVE(pqentry_t, default) + pqentry_t(const pqentry_t &) = default; + pqentry_t &operator=(const pqentry_t &) = default; + pqentry_t(pqentry_t &&) noexcept = default; + pqentry_t &operator=(pqentry_t &&) noexcept = default; ~pqentry_t() = default; diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index 313ec4e8b2e..21f1f0725fa 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -703,7 +703,7 @@ void tool_app_t::static_compile() for (auto &e : map) { sout << "// " << putf8string(e.second.m_module) << "\n"; - sout << "\t{\"" << putf8string(e.first) << "\", reinterpret_cast(&" << putf8string(e.first) << ")},\n"; + sout << "\t{\"" << putf8string(e.first) << "\", reinterpret_cast(&" << putf8string(e.first) << ")}, // NOLINT\n"; } sout << "#endif\n\n"; sout << "{\"\", nullptr}\n"; @@ -1174,7 +1174,7 @@ void tool_app_t::listmodels() { auto model = nt.setup().models().get_model(e); - elems.push_back({model.type(), e}); + elems.emplace_back(model.type(), e); } std::sort(elems.begin(), elems.end(), comp); diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index 09a43178e55..ae241566da9 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -361,8 +361,8 @@ namespace devices { auto &pt = dynamic_cast(*term); // check the connected terminal - auto connected_terminals = netlist.setup().get_connected_terminals(pt); - for (auto ct = connected_terminals->begin(); *ct != nullptr; ct++) + const auto *const connected_terminals = netlist.setup().get_connected_terminals(pt); + for (const auto *ct = connected_terminals->begin(); *ct != nullptr; ct++) { analog_net_t &connected_net = (*ct)->net(); netlist.log().verbose(" Connected net {}", connected_net.name());