Merge pull request #4696

616c243 bitcoin-tx: fix build warnings (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2014-08-14 11:17:15 +02:00
commit 99170259d2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

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