highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-06 03:02:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6914

Browse Source 
114b581 Prevector type (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan
2015-12-01 10:00:04 +01:00
parent 9490bd71bd 114b5812f6
commit 327291af02
19 changed files with 874 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/primitives/transaction.h
View File

@@ -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()