Fix merge errors.

viacoin · Apr 15, 2015 · 5bbf08f · 5bbf08f
1 parent b5839b9
commit 5bbf08f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1823,7 +1823,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     }
 
     // Start enforcing the DERSIG (BIP66) rules, for block.nVersion=4 blocks, when 75% of the network has upgraded:
-    if ((block.nVersion >= 4 & 0xff) && CBlockIndex::IsSuperMajority(4, pindex->pprev, Params().EnforceBlockUpgradeMajority())
+    if ((block.nVersion & 0xff) >= 4 && CBlockIndex::IsSuperMajority(4, pindex->pprev, Params().EnforceBlockUpgradeMajority())
         && pindex->nHeight >= Params().BIP66MinStartBlock()) {
         flags |= SCRIPT_VERIFY_DERSIG;
     }
@@ -2730,7 +2730,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
     }
 
     // Reject block.nVersion=3 blocks when 95% (75% on testnet) of the network has upgraded:
-    if ((block.nVersion < 4 & 0xff) && CBlockIndex::IsSuperMajority(4, pindexPrev, Params().RejectBlockOutdatedMajority())
+    if ((block.nVersion & 0xff) < 4 && CBlockIndex::IsSuperMajority(4, pindexPrev, Params().RejectBlockOutdatedMajority())
             && block.nVersion >= Params().BIP66MinStartBlock())
     {
         return state.Invalid(error("%s : rejected nVersion=3 block", __func__),