diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2010-10-09 17:59:38 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-10-09 17:59:38 -0400 |
| commit | 687c5ef7949a7f0c388ad633b40d243ed6786c4e (patch) | |
| tree | 2316e4497185d0ad9dc6065cf58faf9d7b551363 /serialize.h | |
| parent | 7d5d89856d6ba9a0a25dc5cd42897814cf124c11 (diff) | |
| parent | 103849419a9c014a69c76b6f96e48b66cbc838ca (diff) | |
| download | bitcoin-687c5ef7949a7f0c388ad633b40d243ed6786c4e.tar.xz | |
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'serialize.h')
| -rw-r--r-- | serialize.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/serialize.h b/serialize.h index 94fbe63978..fde83e7a81 100644 --- a/serialize.h +++ b/serialize.h @@ -22,7 +22,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 31302; +static const int VERSION = 31303; static const char* pszSubVer = ""; @@ -725,39 +725,39 @@ public: typedef vector_type::const_iterator const_iterator; typedef vector_type::reverse_iterator reverse_iterator; - explicit CDataStream(int nTypeIn=0, int nVersionIn=VERSION) + explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) { Init(nTypeIn, nVersionIn); } - CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=0, int nVersionIn=VERSION) : vch(pbegin, pend) + CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #if !defined(_MSC_VER) || _MSC_VER >= 1300 - CDataStream(const char* pbegin, const char* pend, int nTypeIn=0, int nVersionIn=VERSION) : vch(pbegin, pend) + CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #endif - CDataStream(const vector_type& vchIn, int nTypeIn=0, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const vector<char>& vchIn, int nTypeIn=0, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const vector<unsigned char>& vchIn, int nTypeIn=0, int nVersionIn=VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) + CDataStream(const vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) { Init(nTypeIn, nVersionIn); } - void Init(int nTypeIn=0, int nVersionIn=VERSION) + void Init(int nTypeIn=SER_NETWORK, int nVersionIn=VERSION) { nReadPos = 0; nType = nTypeIn; |