From 32868b8e2ae103dd1134ec0596f0966762ac401a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 26 Oct 2019 10:40:50 +1100 Subject: srcclean (nw) --- src/lib/netlist/macro/nlm_ttl74xx.h | 2 +- src/lib/netlist/nl_setup.h | 2 +- src/lib/netlist/plib/mat_cr.h | 4 ++-- src/lib/netlist/plib/plists.h | 4 ++-- src/lib/netlist/plib/pparser.cpp | 4 ++-- src/lib/netlist/plib/pstrutil.h | 2 +- src/lib/netlist/prg/nlwav.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index e612ac2b601..8883fa127c4 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -281,7 +281,7 @@ NET_REGISTER_DEV(TTL_74279_DIP, name) #define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7) \ - NET_REGISTER_DEV(DM9312, name) \ + NET_REGISTER_DEV(DM9312, name) \ NET_CONNECT(name, VCC, VCC) \ NET_CONNECT(name, GND, GND) \ NET_CONNECT(name, A, cA) \ diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h index 81779d86b85..21f786c90f5 100644 --- a/src/lib/netlist/nl_setup.h +++ b/src/lib/netlist/nl_setup.h @@ -325,7 +325,7 @@ namespace netlist private: plib::ppreprocessor::defines_map_type m_defines; - plib::psource_collection_t<> m_includes; + plib::psource_collection_t<> m_includes; setup_t &m_setup; log_type &m_log; diff --git a/src/lib/netlist/plib/mat_cr.h b/src/lib/netlist/plib/mat_cr.h index bc06d151042..b21c53671a2 100644 --- a/src/lib/netlist/plib/mat_cr.h +++ b/src/lib/netlist/plib/mat_cr.h @@ -469,7 +469,7 @@ namespace plib for (index_type k = 0; k < base::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()); + // printf("%d %d\n", (int) k, (int) m_ge_par[k].size()); } // contains elimination rows below the diagonal std::vector> m_ge_par; // parallel execution support for Gauss @@ -560,7 +560,7 @@ namespace plib const auto p_i_end = base::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); + // printf("occ %d\n", (int)i); for (auto i_k = base::row_idx[i]; i_k < base::diag[i]; i_k++) { const auto k(base::col_idx[i_k]); diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h index d6c37eaf5ca..4b2b7d41471 100644 --- a/src/lib/netlist/plib/plists.h +++ b/src/lib/netlist/plib/plists.h @@ -391,9 +391,9 @@ namespace plib { using mutex_type = pspin_mutex; using lock_guard_type = std::lock_guard; - mutex_type m_lock; + mutex_type m_lock; PALIGNAS_CACHELINE() - T * m_end; + T * m_end; aligned_vector m_list; public: diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 11da93486a4..abfa524d332 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -327,8 +327,8 @@ void ppreprocessor::error(const pstring &err) #define CHECKTOK2(p_op, p_prio) \ else if (tok == # p_op) \ { \ - if (!has_val) \ - { error("parsing error!"); return 1;} \ + if (!has_val) \ + { error("parsing error!"); return 1;} \ if (prio < (p_prio)) \ return val; \ start++; \ diff --git a/src/lib/netlist/plib/pstrutil.h b/src/lib/netlist/plib/pstrutil.h index d3e62d06af7..69b9651ab0e 100644 --- a/src/lib/netlist/plib/pstrutil.h +++ b/src/lib/netlist/plib/pstrutil.h @@ -17,7 +17,7 @@ #include #include -namespace plib +namespace plib { template struct string_info diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp index 9c6ef9adff8..d2ae6f14c28 100644 --- a/src/lib/netlist/prg/nlwav.cpp +++ b/src/lib/netlist/prg/nlwav.cpp @@ -76,7 +76,7 @@ private: struct riff_chunk_t { std::array group_id = {{'R','I','F','F'}}; - uint32_t filelen = 0; + uint32_t filelen = 0; std::array rifftype = {{'W','A','V','E'}}; }; -- cgit v1.2.3