From bc1c18c74685208461ac5b54b5d4ee0e0f94eb61 Mon Sep 17 00:00:00 2001 From: arbee Date: Thu, 16 May 2019 19:56:17 -0400 Subject: netlist: GCC 9 fixes (nw) --- src/lib/netlist/nl_base.cpp | 4 ++-- src/lib/netlist/nl_base.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index e8b1f59b913..81936490a66 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -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 ... */ diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 8b5f0960aad..46edf941b1d 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -551,9 +551,9 @@ namespace netlist using list_t = std::vector; - 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, -- cgit v1.2.3