diff --git a/src/lz4/lz4.c b/src/lz4/lz4.c index fd229ef..04f4d5f 100644 --- a/src/lz4/lz4.c +++ b/src/lz4/lz4.c @@ -302,7 +302,7 @@ typedef enum { full = 0, partial = 1 } earlyEnd_directive; ****************************/ #if LZ4_ARCH64 -FORCE_INLINE int LZ4_NbCommonBytes (register U64 val) +FORCE_INLINE int LZ4_NbCommonBytes (U64 val) { # if defined(LZ4_BIG_ENDIAN) # if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) @@ -334,7 +334,7 @@ FORCE_INLINE int LZ4_NbCommonBytes (register U64 val) #else -FORCE_INLINE int LZ4_NbCommonBytes (register U32 val) +FORCE_INLINE int LZ4_NbCommonBytes (U32 val) { # if defined(LZ4_BIG_ENDIAN) # if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 6e73452..a1390d1 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -145,7 +145,7 @@ Value listunspent(const Array& params, bool fHelp) "Results are an array of Objects, each of which has:\n" "{txid, vout, scriptPubKey, amount, confirmations}"); - RPCTypeCheck(params, list_of(int_type)(int_type)(array_type)); + RPCTypeCheck(params, {int_type, int_type, array_type}); int nMinDepth = 1; if (params.size() > 0) @@ -221,7 +221,7 @@ Value createrawtransaction(const Array& params, bool fHelp) "Note that the transaction's inputs are not signed, and\n" "it is not stored in the wallet or transmitted to the network."); - RPCTypeCheck(params, list_of(array_type)(obj_type)); + RPCTypeCheck(params, {array_type, obj_type}); Array inputs = params[0].get_array(); Object sendTo = params[1].get_obj(); @@ -281,7 +281,7 @@ Value decoderawtransaction(const Array& params, bool fHelp) "decoderawtransaction \n" "Return a JSON object representing the serialized, hex-encoded transaction."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); vector txData(ParseHex(params[0].get_str())); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); @@ -306,7 +306,7 @@ Value decodescript(const Array& params, bool fHelp) "decodescript \n" "Decode a hex-encoded script."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); Object r; CScript script; @@ -339,7 +339,7 @@ Value signrawtransaction(const Array& params, bool fHelp) " complete : 1 if transaction has a complete set of signature (0 if not)" + HelpRequiringPassphrase()); - RPCTypeCheck(params, list_of(str_type)(array_type)(array_type)(str_type), true); + RPCTypeCheck(params, {str_type, array_type, array_type, str_type}, true); vector txData(ParseHex(params[0].get_str())); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); @@ -398,7 +398,7 @@ Value signrawtransaction(const Array& params, bool fHelp) Object prevOut = p.get_obj(); - RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type)); + RPCTypeCheck(prevOut, {{"txid", str_type}, {"vout", int_type}, {"scriptPubKey", str_type}}); string txidHex = find_value(prevOut, "txid").get_str(); if (!IsHex(txidHex)) @@ -518,7 +518,7 @@ Value sendrawtransaction(const Array& params, bool fHelp) "sendrawtransaction \n" "Submits raw transaction (serialized, hex-encoded) to local node and network."); - RPCTypeCheck(params, list_of(str_type)); + RPCTypeCheck(params, {str_type}); // parse hex string from parameter vector txData(ParseHex(params[0].get_str()));