Merge #10808: Avoid some new gcc warnings in 15

sipa · sipa · commit ec8a50b8d786 · 2017-07-14T18:07:59.000-07:00
c73b8be Explicitly initialize prevector::_union to avoid new warning (Matt Corallo) 1016dac Fix signed/unsigned comparison warning introduced in c8e29d7. (Matt Corallo) Tree-SHA512: d1574b0fdc9bfddc3517c382d34418b1d8ed80c81d2f6fd19378c064af8d7704fb84ef8b740ff97f7ec7609bd6de76348921fcc227e1ce97127947a0d22c7887
diff --git 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
@@ -220,7 +220,7 @@ class prevector {
         }
     }
 
-    prevector() : _size(0) {}
+    prevector() : _size(0), _union{{}} {}
 
     explicit prevector(size_type n) : _size(0) {
         resize(n);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ CScript ParseScript(const std::string& s)`
`27`	`27`
`28`	`28`	`if (mapOpNames.empty())`
`29`	`29`	`{`
`30`		`- for (int op = 0; op <= MAX_OPCODE; op++)`
	`30`	`+ for (unsigned int op = 0; op <= MAX_OPCODE; op++)`
`31`	`31`	`{`
`32`	`32`	`// Allow OP_RESERVED to get into mapOpNames`
`33`	`33`	`if (op < OP_NOP && op != OP_RESERVED)`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ class prevector {`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- prevector() : _size(0) {}`
	`223`	`+ prevector() : _size(0), _union{{}} {}`
`224`	`224`
`225`	`225`	`explicit prevector(size_type n) : _size(0) {`
`226`	`226`	`resize(n);`