diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 17:55:56 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 18:07:59 -0700 |
| commit | ec8a50b8d786a8cd1192e692ab19b46979add582 (patch) | |
| tree | 0b64684e5a3efb283a31cb062e1687b365511e25 | |
| parent | f90603ac6d24f5263649675d51233f1fce8b2ecd (diff) | |
| parent | c73b8be2440e424f304fda22e43240e8b90f9b00 (diff) | |
Merge #10808: Avoid some new gcc warnings in 15
c73b8be24 Explicitly initialize prevector::_union to avoid new warning (Matt Corallo)
1016dacfa Fix signed/unsigned comparison warning introduced in c8e29d7ff0. (Matt Corallo)
Tree-SHA512: d1574b0fdc9bfddc3517c382d34418b1d8ed80c81d2f6fd19378c064af8d7704fb84ef8b740ff97f7ec7609bd6de76348921fcc227e1ce97127947a0d22c7887
| -rw-r--r-- | src/core_read.cpp | 2 | ||||
| -rw-r--r-- | src/prevector.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core_read.cpp b/src/core_read.cpp index 18d02fb913..7018131a13 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -27,7 +27,7 @@ CScript ParseScript(const std::string& s) if (mapOpNames.empty()) { - for (int op = 0; op <= MAX_OPCODE; op++) + for (unsigned int op = 0; op <= MAX_OPCODE; op++) { // Allow OP_RESERVED to get into mapOpNames if (op < OP_NOP && op != OP_RESERVED) diff --git a/src/prevector.h b/src/prevector.h index 02d860bb00..46640d6fff 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -220,7 +220,7 @@ public: } } - prevector() : _size(0) {} + prevector() : _size(0), _union{{}} {} explicit prevector(size_type n) : _size(0) { resize(n); |