diff options
author | 2017-01-29 13:05:33 +0100 | |
---|---|---|
committer | 2017-01-29 15:47:12 +0100 | |
commit | c713f9ed1d4380539480100caefc9156b1359e57 (patch) | |
tree | aafaa58845ab233b2a66fe0301f008e78eb6e49a /src/lib/netlist/macro | |
parent | 2720512e31c8659294d05b336af58d982cd99329 (diff) |
Separate include file usage for netlist.
Device implementations (all cpp files in netlist/devices) now should
only include nl_base.h.
Netlist implementation sources should only include "net_lib.h".
Refactored netlist.h and netlist.cpp to avoid namespace congestion in
netlist.h.
Fixed VC2015 build. (nw)
Diffstat (limited to 'src/lib/netlist/macro')
-rw-r--r-- | src/lib/netlist/macro/nlm_cd4xxx.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_opamp.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_other.cpp | 1 | ||||
-rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.cpp | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.cpp b/src/lib/netlist/macro/nlm_cd4xxx.cpp index 469ff13b954..ed805cb52dc 100644 --- a/src/lib/netlist/macro/nlm_cd4xxx.cpp +++ b/src/lib/netlist/macro/nlm_cd4xxx.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_cd4xxx.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" #include "devices/nld_4020.h" #include "devices/nld_4066.h" diff --git a/src/lib/netlist/macro/nlm_opamp.cpp b/src/lib/netlist/macro/nlm_opamp.cpp index 146f95b72b4..f363c88a100 100644 --- a/src/lib/netlist/macro/nlm_opamp.cpp +++ b/src/lib/netlist/macro/nlm_opamp.cpp @@ -1,9 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Couriersud #include "nlm_opamp.h" - -#include "analog/nld_opamps.h" -#include "devices/nld_system.h" +#include "devices/net_lib.h" /* * Generic layout with 4 opamps, VCC on pin 4 and GND on pin 11 diff --git a/src/lib/netlist/macro/nlm_other.cpp b/src/lib/netlist/macro/nlm_other.cpp index 84a3af4dc04..49f4404427a 100644 --- a/src/lib/netlist/macro/nlm_other.cpp +++ b/src/lib/netlist/macro/nlm_other.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_other.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" /* diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index 6051ceded2c..762a451f835 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -2,7 +2,6 @@ // copyright-holders:Couriersud #include "nlm_ttl74xx.h" -#include "devices/nld_truthtable.h" #include "devices/nld_system.h" |