summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2019-02-25 23:54:53 +0100
committer couriersud <couriersud@gmx.org>2019-03-01 07:48:00 +0100
commit893e67638785723d1add7d5766823c82d3f05b38 (patch)
treed5de1382e40d05e2f78da205116d718114d12807 /src/lib/netlist/plib
parent85f865a782ef99e3d0da73d7a05a5eaad1f1fdb4 (diff)
netlist: cosmetic changes - mostly indentation. (nw)
Diffstat (limited to 'src/lib/netlist/plib')
-rw-r--r--src/lib/netlist/plib/mat_cr.h14
-rw-r--r--src/lib/netlist/plib/pexception.h4
-rw-r--r--src/lib/netlist/plib/pomp.h4
-rw-r--r--src/lib/netlist/plib/pparser.h6
-rw-r--r--src/lib/netlist/plib/ppmf.h4
-rw-r--r--src/lib/netlist/plib/pstream.h7
-rw-r--r--src/lib/netlist/plib/pstring.h4
-rw-r--r--src/lib/netlist/plib/ptypes.h4
-rw-r--r--src/lib/netlist/plib/vector_ops.h4
9 files changed, 25 insertions, 26 deletions
diff --git a/src/lib/netlist/plib/mat_cr.h b/src/lib/netlist/plib/mat_cr.h
index 7fc5d46b85d..4cc027f0d8f 100644
--- a/src/lib/netlist/plib/mat_cr.h
+++ b/src/lib/netlist/plib/mat_cr.h
@@ -10,13 +10,6 @@
#ifndef MAT_CR_H_
#define MAT_CR_H_
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdlib>
-#include <type_traits>
-#include <vector>
-
#include "palloc.h"
#include "parray.h"
#include "pconfig.h"
@@ -25,6 +18,13 @@
#include "ptypes.h"
#include "putil.h"
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <type_traits>
+#include <vector>
+
namespace plib
{
diff --git a/src/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h
index 44daf53d591..28a3ac1adf1 100644
--- a/src/lib/netlist/plib/pexception.h
+++ b/src/lib/netlist/plib/pexception.h
@@ -8,11 +8,11 @@
#ifndef PEXCEPTION_H_
#define PEXCEPTION_H_
-#include <exception>
-
#include "pstring.h"
#include "ptypes.h"
+#include <exception>
+
namespace plib {
//============================================================
diff --git a/src/lib/netlist/plib/pomp.h b/src/lib/netlist/plib/pomp.h
index d86326f4594..f8a516df485 100644
--- a/src/lib/netlist/plib/pomp.h
+++ b/src/lib/netlist/plib/pomp.h
@@ -9,10 +9,10 @@
#ifndef POMP_H_
#define POMP_H_
-#include <cstddef>
-
#include "pconfig.h"
+#include <cstddef>
+
#if HAS_OPENMP
#include "omp.h"
#endif
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index 24b096519bf..1eca20e99ad 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -8,13 +8,13 @@
#ifndef PPARSER_H_
#define PPARSER_H_
-#include <cstdint>
-#include <unordered_map>
-
#include "plists.h"
#include "pstream.h"
#include "pstring.h"
+#include <cstdint>
+#include <unordered_map>
+
namespace plib {
class ptokenizer
diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h
index 32b151b357b..9c5329cccde 100644
--- a/src/lib/netlist/plib/ppmf.h
+++ b/src/lib/netlist/plib/ppmf.h
@@ -8,11 +8,11 @@
#ifndef PPMF_H_
#define PPMF_H_
+#include "pconfig.h"
+
#include <cstdint>
#include <utility>
-#include "pconfig.h"
-
/*
*
* NL_PMF_TYPE_GNUC_PMF
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index aaccf577c4d..ec15c0258c6 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -7,9 +7,6 @@
#ifndef PSTREAM_H_
#define PSTREAM_H_
-#include <array>
-#include <type_traits>
-#include <vector>
#include "palloc.h"
#include "pconfig.h"
@@ -19,6 +16,9 @@
#define USE_CSTREAM (0)
+#include <array>
+#include <type_traits>
+#include <vector>
#if USE_CSTREAM
#include <fstream>
@@ -26,7 +26,6 @@
#include <sstream>
#endif
-
namespace plib {
#if USE_CSTREAM
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 76ad11b0f91..64cb0604b69 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -7,6 +7,8 @@
#ifndef PSTRING_H_
#define PSTRING_H_
+#include "ptypes.h"
+
#include <cstring>
#include <exception>
#include <iterator>
@@ -15,8 +17,6 @@
#include <string>
#include <type_traits>
-#include "ptypes.h"
-
// ----------------------------------------------------------------------------------------
// pstring: semi-immutable strings ...
//
diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h
index 6b4a4af2f75..7d3c064b35d 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 "pconfig.h"
+
#include <limits>
#include <string>
#include <type_traits>
-#include "pconfig.h"
-
#define COPYASSIGNMOVE(name, def) \
name(const name &) = def; \
name(name &&) noexcept = def; \
diff --git a/src/lib/netlist/plib/vector_ops.h b/src/lib/netlist/plib/vector_ops.h
index 0de931b40da..880840e8707 100644
--- a/src/lib/netlist/plib/vector_ops.h
+++ b/src/lib/netlist/plib/vector_ops.h
@@ -10,12 +10,12 @@
#ifndef PLIB_VECTOR_OPS_H_
#define PLIB_VECTOR_OPS_H_
+#include "pconfig.h"
+
#include <algorithm>
#include <cmath>
#include <type_traits>
-#include "pconfig.h"
-
#if !defined(__clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
#if !(__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ > 3))
#pragma GCC diagnostic push