diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 07:25:16 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 07:25:16 -0800 |
| commit | 1f3bc1c2399fb53eb1b2222194332aca07a31a36 (patch) | |
| tree | e7afd7d6d4b892af685985f75d5b3d7b5c2330be /src/util.h | |
| parent | cd2b8832fdb087e740e8d6da69c75f46d69b52d2 (diff) | |
| parent | f8ded588a2f78ac2767a60c716a7d15c273b4fc7 (diff) | |
| download | bitcoin-1f3bc1c2399fb53eb1b2222194332aca07a31a36.tar.xz | |
Merge pull request #707 from gavinandresen/BIP14
Implement BIP 14 : separate protocol version from client version
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.h b/src/util.h index 7b7eaf6dbb..d9a0841a61 100644 --- a/src/util.h +++ b/src/util.h @@ -204,7 +204,7 @@ void SetMockTime(int64 nMockTimeIn); int64 GetAdjustedTime(); void AddTimeData(unsigned int ip, int64 nTime); std::string FormatFullVersion(); - +std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); @@ -558,7 +558,7 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end, } template<typename T> -uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=VERSION) +uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL_VERSION) { // Most of the time is spent allocating and deallocating CDataStream's // buffer. If this ever needs to be optimized further, make a CStaticStream |