diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-03-11 09:35:50 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-03-30 16:10:30 -0700 |
| commit | 4eb5643e3538863c9d2ff261f49a9a1b248de243 (patch) | |
| tree | 377437ffee20c67fa7e0611c31be6b2490a4483c /src/script | |
| parent | 2b1f85e8c52c8bc5a17eae4c809eaf61d724af98 (diff) | |
| download | bitcoin-4eb5643e3538863c9d2ff261f49a9a1b248de243.tar.xz | |
Convert everything except wallet/qt to new serialization
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/keyorigin.h | 8 | ||||
| -rw-r--r-- | src/script/script.h | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/script/keyorigin.h b/src/script/keyorigin.h index 467605ce46..a318ff0f9d 100644 --- a/src/script/keyorigin.h +++ b/src/script/keyorigin.h @@ -18,13 +18,7 @@ struct KeyOriginInfo return std::equal(std::begin(a.fingerprint), std::end(a.fingerprint), std::begin(b.fingerprint)) && a.path == b.path; } - ADD_SERIALIZE_METHODS; - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) - { - READWRITE(fingerprint); - READWRITE(path); - } + SERIALIZE_METHODS(KeyOriginInfo, obj) { READWRITE(obj.fingerprint, obj.path); } void clear() { diff --git a/src/script/script.h b/src/script/script.h index 7aaa10b60b..e3dd57ddc9 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -412,12 +412,7 @@ public: CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { } CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { } - ADD_SERIALIZE_METHODS; - - template <typename Stream, typename Operation> - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITEAS(CScriptBase, *this); - } + SERIALIZE_METHODS(CScript, obj) { READWRITEAS(CScriptBase, obj); } CScript& operator+=(const CScript& b) { |