Merge #18621: script: Disallow silent bool -> CScript conversion

fanquake · fanquake · commit 903be99ee654 · 2020-04-15T14:56:40.000+08:00
88884ee script: Disallow silent bool -> CScript conversion (MarcoFalke) Pull request description: Makes nonsensical stuff like `ScriptToAsmStr(false,false);` a compile failure ACKs for top commit: practicalswift: ACK 88884ee laanwj: ACK 88884ee promag: ACK 88884ee. instagibbs: utACK 88884ee jb55: ACK 88884ee ryanofsky: Code review ACK 88884ee Tree-SHA512: 419d79c03b44a979c061b0540662928251ad68d53e65996bf370bb55ed1526ac7a22710cb7536c9954db5fec07bc312884bf8828f97a4ba180a5b07969a17f54
diff --git a/src/script/script.h b/src/script/script.h
@@ -433,7 +433,7 @@ class CScript : public CScriptBase
         return ret;
     }
 
-    CScript(int64_t b)        { operator<<(b); }
+    explicit CScript(int64_t b) { operator<<(b); }
 
     explicit CScript(opcodetype b)     { operator<<(b); }
     explicit CScript(const CScriptNum& b) { operator<<(b); }

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ class CScript : public CScriptBase`
`433`	`433`	`return ret;`
`434`	`434`	`}`
`435`	`435`
`436`		`- CScript(int64_t b) { operator<<(b); }`
	`436`	`+ explicit CScript(int64_t b) { operator<<(b); }`
`437`	`437`
`438`	`438`	`explicit CScript(opcodetype b) { operator<<(b); }`
`439`	`439`	`explicit CScript(const CScriptNum& b) { operator<<(b); }`