diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 10:00:04 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 10:22:14 +0100 |
| commit | 327291af02d05e09188713d882bf68ac708c1077 (patch) | |
| tree | fd6e45cfb3d11beb185c3d1da556a075c924b165 /src/primitives | |
| parent | 9490bd71bdb41669de7d3c2669241cabf307bb9b (diff) | |
| parent | 114b5812f6283f2325fc31e186b26c6d76f9551a (diff) | |
| download | bitcoin-327291af02d05e09188713d882bf68ac708c1077.tar.xz | |
Merge pull request #6914
114b581 Prevector type (Pieter Wuille)
Diffstat (limited to 'src/primitives')
| -rw-r--r-- | src/primitives/transaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 98882d315e..c5d8a64a6d 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -74,7 +74,7 @@ public: template <typename Stream, typename Operation> inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(prevout); - READWRITE(scriptSig); + READWRITE(*(CScriptBase*)(&scriptSig)); READWRITE(nSequence); } @@ -119,7 +119,7 @@ public: template <typename Stream, typename Operation> inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(nValue); - READWRITE(scriptPubKey); + READWRITE(*(CScriptBase*)(&scriptPubKey)); } void SetNull() |