Auto merge of #2820 - str4d:darwin-build-patches, r=str4d

[macOS] Darwin build patches

Part of #2246.
This commit is contained in:
Homu
2018-04-03 12:44:24 -07:00
18 changed files with 187 additions and 160 deletions

View File

@@ -1056,10 +1056,10 @@ UniValue AsyncRPCOperation_sendmany::perform_joinsplit(
UniValue arrInputMap(UniValue::VARR);
UniValue arrOutputMap(UniValue::VARR);
for (size_t i = 0; i < ZC_NUM_JS_INPUTS; i++) {
arrInputMap.push_back(inputMap[i]);
arrInputMap.push_back(static_cast<uint64_t>(inputMap[i]));
}
for (size_t i = 0; i < ZC_NUM_JS_OUTPUTS; i++) {
arrOutputMap.push_back(outputMap[i]);
arrOutputMap.push_back(static_cast<uint64_t>(outputMap[i]));
}