diff options
-rw-r--r-- | src/lib/netlist/build/makefile | 2 | ||||
-rw-r--r-- | src/lib/netlist/nl_parser.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/nl_setup.cpp | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/gmres.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/palloc.h | 5 | ||||
-rw-r--r-- | src/lib/netlist/plib/pchrono.h | 12 | ||||
-rw-r--r-- | src/lib/netlist/plib/pexception.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfmtlog.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/vector_ops.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_matrix_solver.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_gcr.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_gmres.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_solver.cpp | 2 |
13 files changed, 24 insertions, 14 deletions
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index a324acb463b..9d8c14e1b54 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/nl_parser.h b/src/lib/netlist/nl_parser.h index cbc757307d5..06bcf4395e7 100644 --- a/src/lib/netlist/nl_parser.h +++ b/src/lib/netlist/nl_parser.h @@ -8,8 +8,8 @@ #ifndef NL_PARSER_H_ #define NL_PARSER_H_ -#include "nltypes.h" // for setup_t #include "core/setup.h" +#include "nltypes.h" // for setup_t #include "plib/ptokenizer.h" #include <unordered_map> diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index d28ba51e476..3a4a952841e 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -6,10 +6,10 @@ #include "devices/nlid_proxy.h" #include "devices/nlid_truthtable.h" #include "nl_base.h" +#include "nl_errstr.h" #include "nl_factory.h" #include "nl_parser.h" #include "nl_setup.h" -#include "nl_errstr.h" #include "plib/penum.h" #include "plib/pstonum.h" #include "plib/pstrutil.h" diff --git a/src/lib/netlist/plib/gmres.h b/src/lib/netlist/plib/gmres.h index bb296833238..1709d1bb510 100644 --- a/src/lib/netlist/plib/gmres.h +++ b/src/lib/netlist/plib/gmres.h @@ -8,9 +8,9 @@ /// \file gmres.h /// -#include "pmatrix_cr.h" #include "parray.h" #include "pconfig.h" +#include "pmatrix_cr.h" #include "vector_ops.h" #include <algorithm> diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index ac5094f39a6..9243645f781 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -256,7 +256,10 @@ namespace plib { ~arena_allocator() noexcept = default; - PCOPYASSIGNMOVE(arena_allocator, default) + arena_allocator(const arena_allocator &) = default; + arena_allocator &operator=(const arena_allocator &) = default; + arena_allocator(arena_allocator &&) noexcept = default; + arena_allocator &operator=(arena_allocator &&) noexcept = default; explicit arena_allocator(arena_type & a) noexcept : m_a(a) { diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h index 3cde7cf8649..694099936b9 100644 --- a/src/lib/netlist/plib/pchrono.h +++ b/src/lib/netlist/plib/pchrono.h @@ -197,7 +197,10 @@ namespace plib { explicit 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; } - PCOPYASSIGNMOVE(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; private: timer &m_m; @@ -237,7 +240,12 @@ namespace plib { struct guard_t { guard_t() = default; - PCOPYASSIGNMOVE(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; + // using default constructor will trigger warning on // unused local variable. diff --git a/src/lib/netlist/plib/pexception.cpp b/src/lib/netlist/plib/pexception.cpp index 56ef7f93efb..9bae5896985 100644 --- a/src/lib/netlist/plib/pexception.cpp +++ b/src/lib/netlist/plib/pexception.cpp @@ -136,7 +136,6 @@ namespace plib { #endif } - fpsignalenabler::~fpsignalenabler() { #if HAS_FEENABLE_EXCEPT diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 7ce562fbbf5..733de4fddc2 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -9,10 +9,10 @@ #define PFMTLOG_H_ #include "penum.h" +#include "pgsl.h" #include "ppmf.h" #include "pstring.h" #include "ptypes.h" -#include "pgsl.h" #include <limits> #include <locale> diff --git a/src/lib/netlist/plib/vector_ops.h b/src/lib/netlist/plib/vector_ops.h index c28d97a3b97..86c860b71cb 100644 --- a/src/lib/netlist/plib/vector_ops.h +++ b/src/lib/netlist/plib/vector_ops.h @@ -11,8 +11,8 @@ /// /// #include "pconfig.h" -#include "pmath.h" #include "pgsl.h" +#include "pmath.h" #include <algorithm> #include <array> diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index 94b05d42b00..1ba3b99e012 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -10,10 +10,10 @@ #include "nl_base.h" #include "nl_errstr.h" -#include "plib/pmatrix_cr.h" #include "plib/palloc.h" #include "plib/penum.h" #include "plib/pmatrix2d.h" +#include "plib/pmatrix_cr.h" #include "plib/pmempool.h" #include "plib/putil.h" #include "plib/vector_ops.h" diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h index 71388dc867e..73f9eb83c0d 100644 --- a/src/lib/netlist/solver/nld_ms_gcr.h +++ b/src/lib/netlist/solver/nld_ms_gcr.h @@ -12,8 +12,8 @@ #include "nld_matrix_solver_ext.h" #include "nld_solver.h" -#include "plib/pmatrix_cr.h" #include "plib/pdynlib.h" +#include "plib/pmatrix_cr.h" #include "plib/pstream.h" #include "plib/vector_ops.h" diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h index fd84a50c33d..da18050dca8 100644 --- a/src/lib/netlist/solver/nld_ms_gmres.h +++ b/src/lib/netlist/solver/nld_ms_gmres.h @@ -12,8 +12,8 @@ #include "nld_ms_direct.h" #include "nld_solver.h" #include "plib/gmres.h" -#include "plib/pmatrix_cr.h" #include "plib/parray.h" +#include "plib/pmatrix_cr.h" #include "plib/vector_ops.h" #include <algorithm> diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index cd669256608..9f152369001 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -3,8 +3,8 @@ #include "nl_factory.h" -#include "nl_errstr.h" #include "core/setup.h" +#include "nl_errstr.h" #include "nl_setup.h" // FIXME: only needed for splitter code #include "nld_matrix_solver.h" #include "nld_ms_direct.h" |