From 35f1086ba2ab37ead5cd5f1d76263057ca28678e Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 24 Nov 2019 03:47:36 +0100 Subject: netlist: clang lint fixes and standalone build fix. (nw) --- src/lib/netlist/analog/nlid_twoterm.h | 2 +- src/lib/netlist/build/makefile | 4 +++- src/lib/netlist/devices/nld_7442.cpp | 2 +- src/lib/netlist/devices/nld_tms4800.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h index c85c45b20a2..396b4e938c9 100644 --- a/src/lib/netlist/analog/nlid_twoterm.h +++ b/src/lib/netlist/analog/nlid_twoterm.h @@ -36,9 +36,9 @@ #include "netlist/nl_base.h" #include "netlist/nl_setup.h" +#include "netlist/plib/pfunction.h" #include "netlist/solver/nld_solver.h" #include "nld_generic_models.h" -#include "netlist/plib/pfunction.h" // ----------------------------------------------------------------------------- // Implementation diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index 5fd059b91f7..cc8b62ac287 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -32,7 +32,7 @@ space += TIDY_FLAGS = $(subst $(space),,$(TIDY_FLAGSX)) TIDY_SOURCES = $(SOURCES) -#TIDY_SOURCES = $(SRC)/solver/nld_solver.cpp +#TIDY_SOURCES = $(SRC)/devices/nld_7442.cpp $(SRC)/devices/nld_7492.cpp #TIDY_FLAGS = -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix #TIDY_FLAGS = -checks=llvm-include-order -fix @@ -109,6 +109,7 @@ NLOBJS := \ $(NLOBJ)/devices/nld_4020.o \ $(NLOBJ)/devices/nld_4066.o \ $(NLOBJ)/devices/nld_4316.o \ + $(NLOBJ)/devices/nld_7442.o \ $(NLOBJ)/devices/nld_7448.o \ $(NLOBJ)/devices/nld_7450.o \ $(NLOBJ)/devices/nld_7473.o \ @@ -116,6 +117,7 @@ NLOBJS := \ $(NLOBJ)/devices/nld_7475.o \ $(NLOBJ)/devices/nld_7483.o \ $(NLOBJ)/devices/nld_7485.o \ + $(NLOBJ)/devices/nld_7492.o \ $(NLOBJ)/devices/nld_7490.o \ $(NLOBJ)/devices/nld_7493.o \ $(NLOBJ)/devices/nld_7497.o \ diff --git a/src/lib/netlist/devices/nld_7442.cpp b/src/lib/netlist/devices/nld_7442.cpp index 7e952428b88..73313789413 100644 --- a/src/lib/netlist/devices/nld_7442.cpp +++ b/src/lib/netlist/devices/nld_7442.cpp @@ -89,7 +89,7 @@ namespace devices const netlist_sig_t new_D = m_D(); m_last_val = m_val; - m_val = (new_D << 3) | (new_C << 2) | (new_B << 1) | new_A; + m_val = static_cast((new_D << 3) | (new_C << 2) | (new_B << 1) | new_A); if (m_last_val != m_val) { diff --git a/src/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp index 01b9c09f321..ac3b6f70f6d 100644 --- a/src/lib/netlist/devices/nld_tms4800.cpp +++ b/src/lib/netlist/devices/nld_tms4800.cpp @@ -6,8 +6,8 @@ */ #include "nld_tms4800.h" -#include "netlist/nl_base.h" #include "netlist/devices/nlid_system.h" +#include "netlist/nl_base.h" namespace netlist { -- cgit v1.2.3