diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-16 14:56:45 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-17 20:03:42 +0200 |
| commit | 6b6aaa1698838278a547f16a15e635bd58ec867d (patch) | |
| tree | 62a79e33a866c2a92f548cecb6148c7339f8beaf /src/uint256.h | |
| parent | ccd65d426156c3d5b7a8f1123210decd1f06fe42 (diff) | |
| download | bitcoin-6b6aaa1698838278a547f16a15e635bd58ec867d.tar.xz | |
Further reduce header dependencies
This commit removes the dependency of serialize.h on PROTOCOL_VERSION,
and makes this parameter required instead of implicit. This is much saner,
as it makes the places where changing a version number can have an
influence obvious.
Diffstat (limited to 'src/uint256.h')
| -rw-r--r-- | src/uint256.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/uint256.h b/src/uint256.h index 3524580532..bf3c55bccb 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -10,8 +10,6 @@ #include <string> #include <vector> -#include "version.h" - typedef long long int64; typedef unsigned long long uint64; @@ -355,19 +353,22 @@ public: return pn[2*n] | (uint64)pn[2*n+1] << 32; } - unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const +// unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const + unsigned int GetSerializeSize(int nType, int nVersion) const { return sizeof(pn); } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const +// void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const + void Serialize(Stream& s, int nType, int nVersion) const { s.write((char*)pn, sizeof(pn)); } template<typename Stream> - void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) +// void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) + void Unserialize(Stream& s, int nType, int nVersion) { s.read((char*)pn, sizeof(pn)); } |