Browse Source

Merge pull request #4696

616c243 bitcoin-tx: fix build warnings (Cory Fields)
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
99170259d2
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 12
      src/bitcoin-tx.cpp

12
src/bitcoin-tx.cpp

@ -283,12 +283,12 @@ static const struct {
const char *flagStr; const char *flagStr;
int flags; int flags;
} sighashOptions[N_SIGHASH_OPTS] = { } sighashOptions[N_SIGHASH_OPTS] = {
"ALL", SIGHASH_ALL, {"ALL", SIGHASH_ALL},
"NONE", SIGHASH_NONE, {"NONE", SIGHASH_NONE},
"SINGLE", SIGHASH_SINGLE, {"SINGLE", SIGHASH_SINGLE},
"ALL|ANYONECANPAY", SIGHASH_ALL|SIGHASH_ANYONECANPAY, {"ALL|ANYONECANPAY", SIGHASH_ALL|SIGHASH_ANYONECANPAY},
"NONE|ANYONECANPAY", SIGHASH_NONE|SIGHASH_ANYONECANPAY, {"NONE|ANYONECANPAY", SIGHASH_NONE|SIGHASH_ANYONECANPAY},
"SINGLE|ANYONECANPAY", SIGHASH_SINGLE|SIGHASH_ANYONECANPAY, {"SINGLE|ANYONECANPAY", SIGHASH_SINGLE|SIGHASH_ANYONECANPAY},
}; };
static bool findSighashFlags(int& flags, const string& flagStr) static bool findSighashFlags(int& flags, const string& flagStr)

Loading…
Cancel
Save