highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from gavinandresen/BIP14

Browse Source 
Implement BIP 14 : separate protocol version from client version
This commit is contained in:
Gavin Andresen
2011-12-19 07:25:16 -08:00
parent cd2b8832fd f8ded588a2
commit 1f3bc1c239
12 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util.h
View File

@@ -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