diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-16 16:26:14 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 10:24:23 -0500 |
| commit | f8ded588a2f78ac2767a60c716a7d15c273b4fc7 (patch) | |
| tree | f8bb01303f5feb0bf04a8fb01ada04b58304a207 /src/util.h | |
| parent | 8896c2d9d64d71e25b31d7a389f0b8db49a1e50a (diff) | |
| download | bitcoin-f8ded588a2f78ac2767a60c716a7d15c273b4fc7.tar.xz | |
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 1ef0e6f15c..f5357b7de1 100644 --- a/src/util.h +++ b/src/util.h @@ -205,7 +205,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); @@ -559,7 +559,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 |