Unverified Commit faa97d9d authored by squbs's avatar squbs Committed by GitHub

Merge pull request #12 from bynante/master

hash.h typo fixes - change is sound and tested working. Thanks.
parents 61b48e00 517257cc
......@@ -72,8 +72,8 @@ public:
CMainParams() {
strNetworkID = "main";
consensus.BIP34Height = 0;
consensus.BIP34Hash = uint256S("00000df14d859c4b3219d93978bcf02afc123d2344a2ed39033e1208948aa7c0");
consensus.BIP34Height = 1;
consensus.BIP34Hash = uint256S("00000b6321951f2ed170bbc9b7a360995176f2df418b0e275149bfce2fde3d6c");
consensus.BIP65Height = 0;
consensus.BIP66Height = 0;
consensus.BIP102HeightDelta = 0;
......
......@@ -138,7 +138,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end,
}
/**TODO-- */
/** Compute the 256-bit hash of the concatenation of three objects. */
/** Compute the 256-bit hash of the concatenation of four objects. */
template<typename T1, typename T2, typename T3, typename T4>
inline uint256 Hash(const T1 p1begin, const T1 p1end,
const T2 p2begin, const T2 p2end,
......@@ -154,7 +154,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end,
return result;
}
/** Compute the 256-bit hash of the concatenation of three objects. */
/** Compute the 256-bit hash of the concatenation of five objects. */
template<typename T1, typename T2, typename T3, typename T4, typename T5>
inline uint256 Hash(const T1 p1begin, const T1 p1end,
const T2 p2begin, const T2 p2end,
......@@ -172,7 +172,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end,
return result;
}
/** Compute the 256-bit hash of the concatenation of three objects. */
/** Compute the 256-bit hash of the concatenation of six objects. */
template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
inline uint256 Hash(const T1 p1begin, const T1 p1end,
const T2 p2begin, const T2 p2end,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment