diff options
-rw-r--r-- | src/lib/netlist/analog/nld_opamps.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/netlist_types.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/nl_base.cpp | 6 | ||||
-rw-r--r-- | src/lib/netlist/nl_lists.h | 8 | ||||
-rw-r--r-- | src/lib/netlist/nl_time.h | 4 | ||||
-rwxr-xr-x | src/lib/netlist/plib/palloc.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/palloc.h | 3 | ||||
-rw-r--r-- | src/lib/netlist/plib/pchrono.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pchrono.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pexception.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pexception.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfmtlog.cpp | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfmtlog.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 5 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfunction.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/plists.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pparser.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pparser.h | 7 | ||||
-rwxr-xr-x | src/lib/netlist/plib/ppmf.h | 1 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstring.cpp | 8 | ||||
-rw-r--r-- | src/lib/netlist/plib/ptypes.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/putil.cpp | 8 |
22 files changed, 53 insertions, 52 deletions
diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp index 680b2d1b885..f39bcf64207 100644 --- a/src/lib/netlist/analog/nld_opamps.cpp +++ b/src/lib/netlist/analog/nld_opamps.cpp @@ -11,7 +11,6 @@ #include "nlid_twoterm.h" #include "nlid_fourterm.h" - #include <cmath> namespace netlist diff --git a/src/lib/netlist/netlist_types.h b/src/lib/netlist/netlist_types.h index c7c4aef4750..0bd32be21be 100644 --- a/src/lib/netlist/netlist_types.h +++ b/src/lib/netlist/netlist_types.h @@ -9,13 +9,13 @@ #ifndef NETLIST_TYPES_H_ #define NETLIST_TYPES_H_ -#include <cstdint> -#include <unordered_map> - #include "nl_config.h" #include "plib/pchrono.h" #include "plib/pstring.h" +#include <cstdint> +#include <unordered_map> + namespace netlist { //============================================================ diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index c2e81ee69a2..56a88ad60fc 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -5,9 +5,6 @@ * */ -#include <cstring> -#include <cmath> - #include "solver/nld_matrix_solver.h" #include "solver/nld_solver.h" @@ -21,6 +18,9 @@ #include "nl_errstr.h" +#include <cstring> +#include <cmath> + namespace netlist { namespace detail diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h index a841db1e084..788d65f4c1b 100644 --- a/src/lib/netlist/nl_lists.h +++ b/src/lib/netlist/nl_lists.h @@ -10,16 +10,16 @@ #ifndef NLLISTS_H_ #define NLLISTS_H_ -#include <atomic> -#include <thread> -#include <mutex> - #include "nl_config.h" #include "netlist_types.h" #include "plib/plists.h" #include "plib/pchrono.h" #include "plib/ptypes.h" +#include <atomic> +#include <thread> +#include <mutex> + // ---------------------------------------------------------------------------------------- // timed queue // ---------------------------------------------------------------------------------------- diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h index 7706555f995..fd4ddb77445 100644 --- a/src/lib/netlist/nl_time.h +++ b/src/lib/netlist/nl_time.h @@ -7,12 +7,12 @@ #ifndef NLTIME_H_ #define NLTIME_H_ -#include <cstdint> - #include "nl_config.h" #include "plib/ptypes.h" #include "plib/pstate.h" +#include <cstdint> + //============================================================ // MACROS //============================================================ diff --git a/src/lib/netlist/plib/palloc.cpp b/src/lib/netlist/plib/palloc.cpp index 1377edabde5..db950c0f6a1 100755 --- a/src/lib/netlist/plib/palloc.cpp +++ b/src/lib/netlist/plib/palloc.cpp @@ -5,12 +5,12 @@ * */ -#include <algorithm> - #include "pconfig.h" #include "palloc.h" #include "pfmtlog.h" +#include <algorithm> + namespace plib { //============================================================ diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index 57dbff5588d..a35bc50ff17 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -8,9 +8,10 @@ #ifndef PALLOC_H_ #define PALLOC_H_ +#include "pstring.h" + #include <vector> #include <memory> -#include "pstring.h" namespace plib { diff --git a/src/lib/netlist/plib/pchrono.cpp b/src/lib/netlist/plib/pchrono.cpp index a1cc85e6964..971d19b3645 100644 --- a/src/lib/netlist/plib/pchrono.cpp +++ b/src/lib/netlist/plib/pchrono.cpp @@ -1,10 +1,10 @@ // license:GPL-2.0+ // copyright-holders:Couriersud -#include <chrono> - #include "pchrono.h" +#include <chrono> + namespace plib { namespace chrono { #if defined(__x86_64__) && !defined(_clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)) diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h index 5d64f9c4add..a229128e7b8 100644 --- a/src/lib/netlist/plib/pchrono.h +++ b/src/lib/netlist/plib/pchrono.h @@ -8,11 +8,11 @@ #ifndef PCHRONO_H_ #define PCHRONO_H_ +#include "pconfig.h" + #include <cstdint> #include <chrono> -#include "pconfig.h" - namespace plib { namespace chrono { template <typename T> diff --git a/src/lib/netlist/plib/pexception.cpp b/src/lib/netlist/plib/pexception.cpp index 282acfe30d5..ba2f9237f35 100644 --- a/src/lib/netlist/plib/pexception.cpp +++ b/src/lib/netlist/plib/pexception.cpp @@ -5,11 +5,11 @@ * */ -#include <cfenv> - #include "pexception.h" #include "pfmtlog.h" +#include <cfenv> + #if (defined(__x86_64__) || defined(__i386__)) && defined(__linux__) #define HAS_FEENABLE_EXCEPT (1) #else diff --git a/src/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h index 9ef3077a75d..a092d98ee92 100644 --- a/src/lib/netlist/plib/pexception.h +++ b/src/lib/netlist/plib/pexception.h @@ -8,10 +8,10 @@ #ifndef PEXCEPTION_H_ #define PEXCEPTION_H_ -#include <exception> - #include "pstring.h" +#include <exception> + namespace plib { //============================================================ // exception base diff --git a/src/lib/netlist/plib/pfmtlog.cpp b/src/lib/netlist/plib/pfmtlog.cpp index 9451e11866d..bae321395d9 100644 --- a/src/lib/netlist/plib/pfmtlog.cpp +++ b/src/lib/netlist/plib/pfmtlog.cpp @@ -5,14 +5,14 @@ * */ +#include "pfmtlog.h" +#include "palloc.h" + #include <cstring> #include <cstdlib> #include <cstdarg> #include <algorithm> -#include "pfmtlog.h" -#include "palloc.h" - namespace plib { plog_dispatch_intf::~plog_dispatch_intf() diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 681607bddc0..74bf41241f4 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -7,11 +7,11 @@ #ifndef PFMT_H_ #define PFMT_H_ -#include <limits> - #include "pstring.h" #include "ptypes.h" +#include <limits> + namespace plib { P_ENUM(plog_level, diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index b457c940021..f5c25ec8ea0 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -5,13 +5,14 @@ * */ -#include <cmath> -#include <stack> #include "pfunction.h" #include "pfmtlog.h" #include "putil.h" #include "pexception.h" +#include <cmath> +#include <stack> + namespace plib { void pfunction::compile(const std::vector<pstring> &inputs, const pstring expr) diff --git a/src/lib/netlist/plib/pfunction.h b/src/lib/netlist/plib/pfunction.h index da61fe84e17..b5f8194c690 100644 --- a/src/lib/netlist/plib/pfunction.h +++ b/src/lib/netlist/plib/pfunction.h @@ -8,10 +8,10 @@ #ifndef PFUNCTION_H_ #define PFUNCTION_H_ -#include <vector> - #include "pstring.h" +#include <vector> + namespace plib { //============================================================ diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h index e792ae06ca9..8da1f2c5423 100644 --- a/src/lib/netlist/plib/plists.h +++ b/src/lib/netlist/plib/plists.h @@ -10,10 +10,10 @@ #ifndef PLISTS_H_ #define PLISTS_H_ -#include <vector> - #include "pstring.h" +#include <vector> + namespace plib { /* ---------------------------------------------------------------------------------------- * uninitialised_array_t: diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 6604c07dcb7..4032be181ed 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -5,12 +5,12 @@ * */ -#include <cstdarg> - #include "pparser.h" #include "palloc.h" #include "putil.h" +#include <cstdarg> + namespace plib { // ---------------------------------------------------------------------------------------- // A simple tokenizer diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h index 321dad2f608..ceebdca22ea 100644 --- a/src/lib/netlist/plib/pparser.h +++ b/src/lib/netlist/plib/pparser.h @@ -8,14 +8,13 @@ #ifndef PPARSER_H_ #define PPARSER_H_ -#include <unordered_map> -#include <cstdint> - #include "pstring.h" #include "plists.h" -//#include "putil.h" #include "pstream.h" +#include <unordered_map> +#include <cstdint> + namespace plib { class ptokenizer : nocopyassignmove { diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h index a80fbf2ec86..9812633065c 100755 --- a/src/lib/netlist/plib/ppmf.h +++ b/src/lib/netlist/plib/ppmf.h @@ -9,6 +9,7 @@ #define PPMF_H_ #include "pconfig.h" + #include <utility> #include <cstdint> diff --git a/src/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp index 3369f23b6e2..7deeb011bd7 100644 --- a/src/lib/netlist/plib/pstring.cpp +++ b/src/lib/netlist/plib/pstring.cpp @@ -5,15 +5,15 @@ * */ +#include "pstring.h" +#include "palloc.h" +#include "plists.h" + #include <cstring> #include <algorithm> #include <stack> #include <cstdlib> -#include "pstring.h" -#include "palloc.h" -#include "plists.h" - template <typename F> pstr_t pstring_t<F>::m_zero(0); template<typename F> diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h index 182333875d0..46428c9ed8a 100644 --- a/src/lib/netlist/plib/ptypes.h +++ b/src/lib/netlist/plib/ptypes.h @@ -8,12 +8,12 @@ #ifndef PTYPES_H_ #define PTYPES_H_ -#include <type_traits> -#include <limits> - #include "pconfig.h" #include "pstring.h" +#include <type_traits> +#include <limits> + namespace plib { template<typename T> struct is_integral : public std::is_integral<T> { }; diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp index f4251e161fa..ce5e0adbdd1 100644 --- a/src/lib/netlist/plib/putil.cpp +++ b/src/lib/netlist/plib/putil.cpp @@ -1,15 +1,15 @@ // license:GPL-2.0+ // copyright-holders:Couriersud +#include "putil.h" +#include "ptypes.h" +#include "plists.h" + #include <cstring> #include <cstdlib> #include <algorithm> #include <initializer_list> -#include "putil.h" -#include "ptypes.h" -#include "plists.h" - namespace plib { namespace util |