diff --git a/configure.ac b/configure.ac index c7fdcb60b7ae5..cf8c21a7166dd 100644 --- a/configure.ac +++ b/configure.ac @@ -437,6 +437,7 @@ if test "x$enable_werror" = "xyes"; then if test "x$CXXFLAG_WERROR" = "x"; then AC_MSG_ERROR("enable-werror set but -Werror is not usable") fi + AX_CHECK_COMPILE_FLAG([-Werror=reorder],[ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror=reorder"],,[[$CXXFLAG_WERROR]]) AX_CHECK_COMPILE_FLAG([-Werror=vla],[ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror=vla"],,[[$CXXFLAG_WERROR]]) AX_CHECK_COMPILE_FLAG([-Werror=shadow-field],[ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror=shadow-field"],,[[$CXXFLAG_WERROR]]) AX_CHECK_COMPILE_FLAG([-Werror=switch],[ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror=switch"],,[[$CXXFLAG_WERROR]]) diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp index e17f071ccd1ff..57afcd92adbfc 100644 --- a/src/evo/simplifiedmns.cpp +++ b/src/evo/simplifiedmns.cpp @@ -34,12 +34,12 @@ CSimplifiedMNListEntry::CSimplifiedMNListEntry(const CDeterministicMN& dmn) : pubKeyOperator(dmn.pdmnState->pubKeyOperator), keyIDVoting(dmn.pdmnState->keyIDVoting), isValid(!dmn.pdmnState->IsBanned()), + platformHTTPPort(dmn.pdmnState->platformHTTPPort), + platformNodeID(dmn.pdmnState->platformNodeID), scriptPayout(dmn.pdmnState->scriptPayout), scriptOperatorPayout(dmn.pdmnState->scriptOperatorPayout), nVersion(dmn.pdmnState->nVersion == CProRegTx::LEGACY_BLS_VERSION ? LEGACY_BLS_VERSION : BASIC_BLS_VERSION), - nType(dmn.nType), - platformHTTPPort(dmn.pdmnState->platformHTTPPort), - platformNodeID(dmn.pdmnState->platformNodeID) + nType(dmn.nType) { } diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h index 0102ef760cbe6..3f72c2131bf12 100644 --- a/src/evo/simplifiedmns.h +++ b/src/evo/simplifiedmns.h @@ -34,12 +34,12 @@ class CSimplifiedMNListEntry CBLSLazyPublicKey pubKeyOperator; CKeyID keyIDVoting; bool isValid{false}; - MnType nType{MnType::Regular}; uint16_t platformHTTPPort{0}; uint160 platformNodeID{}; CScript scriptPayout; // mem-only CScript scriptOperatorPayout; // mem-only uint16_t nVersion{LEGACY_BLS_VERSION}; + MnType nType{MnType::Regular}; CSimplifiedMNListEntry() = default; explicit CSimplifiedMNListEntry(const CDeterministicMN& dmn); diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 737d2243ef5b6..fceb8db854dc1 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -303,9 +303,9 @@ class PeerManagerImpl final : public PeerManager const CChainParams& m_chainparams; CConnman& m_connman; + CAddrMan& m_addrman; /** Pointer to this node's banman. May be nullptr - check existence before dereferencing. */ BanMan* const m_banman; - CAddrMan& m_addrman; ChainstateManager& m_chainman; CTxMemPool& m_mempool; const std::unique_ptr& m_llmq_ctx; diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index faadbdaaafcbf..4ac43a2914695 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -46,9 +46,9 @@ WalletModel::WalletModel(std::unique_ptr wallet, ClientModel transactionTableModel(nullptr), recentRequestsTableModel(nullptr), cachedEncryptionStatus(Unencrypted), + timer(new QTimer(this)), cachedNumISLocks(0), - cachedCoinJoinRounds(0), - timer(new QTimer(this)) + cachedCoinJoinRounds(0) { fHaveWatchOnly = m_wallet->haveWatchOnly(); addressTableModel = new AddressTableModel(this);