diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-14 11:17:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-14 12:00:58 +0200 |
| commit | 99170259d26336912ded65e248a3b3334820eb41 (patch) | |
| tree | dc8dde75332c5ae62566d79cc6ca869465df128e /src | |
| parent | 9ee09dc64fbe712401c57b458c8254a1fdaaa5f2 (diff) | |
| parent | 616c24307f4f18d7dbd603b5d9688904f2d74210 (diff) | |
| download | bitcoin-99170259d26336912ded65e248a3b3334820eb41.tar.xz | |
Merge pull request #4696
616c243 bitcoin-tx: fix build warnings (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/bitcoin-tx.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 299315424b..ffe87298f6 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -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) |