From 7a0b3034c725cef787524c246f6d3725a031c0e0 Mon Sep 17 00:00:00 2001 From: chromatic Date: Wed, 1 Sep 2021 20:52:06 -0700 Subject: [PATCH] Remove more implicit fallthrough compiler warnings --- src/hash.cpp | 2 ++ src/qt/rpcconsole.cpp | 3 +++ src/rest.cpp | 1 + src/rpc/mining.cpp | 6 ++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/hash.cpp b/src/hash.cpp index a14a2386a..460ec3c86 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -49,8 +49,10 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector strRequestV = ParseHex(strRequestMutable); strRequestMutable.assign(strRequestV.begin(), strRequestV.end()); } + // Falls through case RF_BINARY: { try { diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 35320ecdf..387656baa 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -666,9 +666,11 @@ UniValue getblocktemplate(const JSONRPCRequest& request) // Not exposed to GBT at all break; case THRESHOLD_LOCKED_IN: - // Ensure bit is set in block version + { + // Ensure bit is set in block version, then fall through to get vbavailable set pblock->nVersion |= VersionBitsMask(consensusParams, pos); - // FALL THROUGH to get vbavailable set... + } + // Falls through case THRESHOLD_STARTED: { const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];