fix gcc-8 / g++-8 build
This commit is contained in:
@@ -335,7 +335,7 @@ public:
|
|||||||
nSolution = block.nSolution;
|
nSolution = block.nSolution;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t SetHeight(int32_t height)
|
void SetHeight(int32_t height)
|
||||||
{
|
{
|
||||||
this->chainPower.nHeight = height;
|
this->chainPower.nHeight = height;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,8 +115,8 @@ struct Params {
|
|||||||
int64_t AveragingWindowTimespan() const { return nPowAveragingWindow * nPowTargetSpacing; }
|
int64_t AveragingWindowTimespan() const { return nPowAveragingWindow * nPowTargetSpacing; }
|
||||||
int64_t MinActualTimespan() const { return (AveragingWindowTimespan() * (100 - nPowMaxAdjustUp )) / 100; }
|
int64_t MinActualTimespan() const { return (AveragingWindowTimespan() * (100 - nPowMaxAdjustUp )) / 100; }
|
||||||
int64_t MaxActualTimespan() const { return (AveragingWindowTimespan() * (100 + nPowMaxAdjustDown)) / 100; }
|
int64_t MaxActualTimespan() const { return (AveragingWindowTimespan() * (100 + nPowMaxAdjustDown)) / 100; }
|
||||||
int32_t SetSaplingHeight(int32_t height) { vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height; }
|
void SetSaplingHeight(int32_t height) { vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = height; }
|
||||||
int32_t SetOverwinterHeight(int32_t height) { vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height; }
|
void SetOverwinterHeight(int32_t height) { vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = height; }
|
||||||
uint256 nMinimumChainWork;
|
uint256 nMinimumChainWork;
|
||||||
};
|
};
|
||||||
} // namespace Consensus
|
} // namespace Consensus
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ class CVerusHashV2
|
|||||||
result = buf2;
|
result = buf2;
|
||||||
curPos = 0;
|
curPos = 0;
|
||||||
std::fill(buf1, buf1 + sizeof(buf1), 0);
|
std::fill(buf1, buf1 + sizeof(buf1), 0);
|
||||||
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t *ExtraI64Ptr() { return (int64_t *)(curBuf + 32); }
|
int64_t *ExtraI64Ptr() { return (int64_t *)(curBuf + 32); }
|
||||||
|
|||||||
Reference in New Issue
Block a user