Skip to content

Commit

Permalink
Merge bitcoin#9556: Remove redundant semicolons
Browse files Browse the repository at this point in the history
8fc6989 Remove redundant semicolons (practicalswift)
  • Loading branch information
laanwj authored and andvgal committed Dec 25, 2018
1 parent 0bca3ab commit be41362
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/hash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
k1 = ROTL32(k1, 15);
k1 *= c2;
h1 ^= k1;
};
}
}

//----------
Expand Down
4 changes: 2 additions & 2 deletions src/rpc/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -757,15 +757,15 @@ class submitblock_StateCatcher : public CValidationInterface
bool found;
CValidationState state;

submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {};
submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {}

protected:
virtual void BlockChecked(const CBlock& block, const CValidationState& stateIn) {
if (block.GetHash() != hash)
return;
found = true;
state = stateIn;
};
}
};

UniValue submitblock(const JSONRPCRequest& request)
Expand Down
2 changes: 1 addition & 1 deletion src/test/versionbits_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(versionbits_computeblockversion)
blocksToMine--;
nTime += 600;
nHeight += 1;
};
}

nTime = nTimeout;
// FAILED is only triggered at the end of a period, so CBV should be setting
Expand Down

0 comments on commit be41362

Please sign in to comment.