diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-17 11:04:29 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-17 11:04:29 -0700 |
| commit | 1ffeb89a52d82bb62860786ff6426224437ca7b1 (patch) | |
| tree | 62a79e33a866c2a92f548cecb6148c7339f8beaf /src/uint256.h | |
| parent | b97d54355e8239273b50c54dbedfde16ed82fd73 (diff) | |
| parent | 6b6aaa1698838278a547f16a15e635bd58ec867d (diff) | |
Merge pull request #1112 from sipa/saneserial
Further reduce header dependencies
Diffstat (limited to 'src/uint256.h')
| -rw-r--r-- | src/uint256.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/uint256.h b/src/uint256.h index 309c1f7995..bf3c55bccb 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -5,9 +5,8 @@ #ifndef BITCOIN_UINT256_H #define BITCOIN_UINT256_H -#include "serialize.h" - #include <limits.h> +#include <string.h> #include <string> #include <vector> @@ -354,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)); } |