aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-04-15 14:17:31 +0800
committerfanquake <fanquake@gmail.com>2020-04-15 14:56:40 +0800
commit903be99ee6541d46cfb2d01116798f8d5522b31a (patch)
tree4763c189ad1b324e41afc5f2aed552f4701b79e7
parent4d793bcfe81479d1bf34805c3960c4611eb8fc9b (diff)
parent88884ee8d8dcd5303b20e54801b03f9631959c76 (diff)
Merge #18621: script: Disallow silent bool -> CScript conversion
88884ee8d8dcd5303b20e54801b03f9631959c76 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 88884ee8d8dcd5303b20e54801b03f9631959c76 laanwj: ACK 88884ee8d8dcd5303b20e54801b03f9631959c76 promag: ACK 88884ee8d8dcd5303b20e54801b03f9631959c76. instagibbs: utACK 88884ee8d8dcd5303b20e54801b03f9631959c76 jb55: ACK 88884ee8d8dcd5303b20e54801b03f9631959c76 ryanofsky: Code review ACK 88884ee8d8dcd5303b20e54801b03f9631959c76 Tree-SHA512: 419d79c03b44a979c061b0540662928251ad68d53e65996bf370bb55ed1526ac7a22710cb7536c9954db5fec07bc312884bf8828f97a4ba180a5b07969a17f54
-rw-r--r--src/script/script.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.h b/src/script/script.h
index 7aaa10b60b..dd2ab2f070 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -433,7 +433,7 @@ public:
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); }