netlist: GCC 9 fixes (nw)

This commit is contained in:
arbee 2019-05-16 19:56:17 -04:00
parent 9b71ef7496
commit bc1c18c746
2 changed files with 5 additions and 5 deletions

View File

@ -728,9 +728,9 @@ void detail::net_t::update_devs() NL_NOEXCEPT
{
nl_assert(this->isRailNet());
const auto new_Q(m_new_Q);
const unsigned int new_Q(m_new_Q);
const auto mask((new_Q << core_terminal_t::INP_LH_SHIFT)
const unsigned int mask((new_Q << core_terminal_t::INP_LH_SHIFT)
| (m_cur_Q << core_terminal_t::INP_HL_SHIFT));
m_in_queue = queue_status::DELIVERED; /* mark as taken ... */

View File

@ -551,9 +551,9 @@ namespace netlist
using list_t = std::vector<core_terminal_t *>;
static constexpr const auto INP_HL_SHIFT = 0;
static constexpr const auto INP_LH_SHIFT = 1;
static constexpr const auto INP_ACTIVE_SHIFT = 2;
static constexpr const unsigned int INP_HL_SHIFT = 0;
static constexpr const unsigned int INP_LH_SHIFT = 1;
static constexpr const unsigned int INP_ACTIVE_SHIFT = 2;
enum state_e {
STATE_INP_PASSIVE = 0,