MERGE-FIX: various compilation fixes

This commit is contained in:
Gregory Sanders 2019-01-28 06:47:00 -05:00
parent c62fab2d69
commit 51584e73a3
11 changed files with 29 additions and 28 deletions

View file

@ -95,8 +95,7 @@ txnouttype Solver(const CScript& scriptPubKey, std::vector<std::vector<unsigned
vSolutionsRet.clear();
if (Params().anyonecanspend_aremine && scriptPubKey == CScript() << OP_TRUE) {
typeRet = TX_TRUE;
return true;
return TX_TRUE;
}
// Shortcut for pay-to-script-hash, which are more constrained than the other types: