Merge 3212d104f4 into merged_master (Bitcoin PR bitcoin/bitcoin#23829)

This commit is contained in:
Tom Trevethan 2025-04-01 15:23:27 +00:00
commit 694c51a39f
23 changed files with 47 additions and 47 deletions

View file

@ -218,7 +218,7 @@ protected:
public:
explicit VersionBitsConditionChecker(Consensus::DeploymentPos id_) : id(id_) {}
uint32_t Mask(const Consensus::Params& params) const { return ((uint32_t)1) << params.vDeployments[id].bit; }
uint32_t Mask(const Consensus::Params& params) const { return (uint32_t{1}) << params.vDeployments[id].bit; }
};
} // namespace