diff options
| author | 2019-05-12 14:08:07 +0200 | |
|---|---|---|
| committer | 2019-05-12 14:08:16 +0200 | |
| commit | 4437d3bbc2b61386a139f08748766c850d6cda95 (patch) | |
| tree | d6d13480e9bb5ba3198397ba6ff7f528b9e3f92f /src/lib | |
| parent | 4be4bb12e983c6e4effba4e8c5e462fae2c59581 (diff) | |
netlist: array -> std::array (nw)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/netlist/devices/nld_74161.cpp | 4 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_7474.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/netlist/devices/nld_74161.cpp b/src/lib/netlist/devices/nld_74161.cpp index b2d371a6946..ae58a43feba 100644 --- a/src/lib/netlist/devices/nld_74161.cpp +++ b/src/lib/netlist/devices/nld_74161.cpp @@ -9,6 +9,8 @@ #include "netlist/nl_base.h" #include "nlid_system.h" +#include <array> + namespace netlist { namespace devices @@ -91,7 +93,7 @@ namespace netlist } // FIXME: Timing - static constexpr const netlist_time delay[4] = + static constexpr const std::array<netlist_time, 4> delay = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(40), diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp index 495d8e0194a..42d4d06b429 100644 --- a/src/lib/netlist/devices/nld_7474.cpp +++ b/src/lib/netlist/devices/nld_7474.cpp @@ -10,6 +10,8 @@ #include "netlist/nl_base.h" #include "nlid_system.h" +#include <array> + namespace netlist { namespace devices @@ -48,7 +50,7 @@ namespace netlist void newstate(const netlist_sig_t stateQ, const netlist_sig_t stateQQ) { // 0: High-to-low 40 ns, 1: Low-to-high 25 ns - static constexpr const netlist_time delay[2] = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) }; + static constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) }; m_Q.push(stateQ, delay[stateQ]); m_QQ.push(stateQQ, delay[stateQQ]); } |
