diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:08:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:42:44 +0200 |
| commit | d4211176208b5e4ae4a699c6ce3239447752cdb2 (patch) | |
| tree | 2f1c91d534d1571e3a04c000d66590964bbc213e /src/script.h | |
| parent | a24b23622e504f5134dd8011af5bbe68cb9443f1 (diff) | |
| parent | 5b0fc31b1c3d25039262ae2043474b35c14bd30b (diff) | |
| download | bitcoin-d4211176208b5e4ae4a699c6ce3239447752cdb2.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.h b/src/script.h index ae9fdfffa2..2a36db2faf 100644 --- a/src/script.h +++ b/src/script.h @@ -486,7 +486,7 @@ public: { // I'm not sure if this should push the script or concatenate scripts. // If there's ever a use for pushing a script onto a script, delete this member fn - assert(("warning: pushing a CScript onto a CScript with << is probably not intended, use + to concatenate", false)); + assert(!"warning: pushing a CScript onto a CScript with << is probably not intended, use + to concatenate"); return *this; } |