Fix inconsistent integer comparison warnings

SmallJoker · SmallJoker · commit 3b842a7e021f · 2021-08-17T20:00:47.000+02:00
diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp
@@ -102,7 +102,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
 
 	// Then repeatedly look for transparent pixels, filling them in until
 	// we're finished.
-	for (u32 iter = 0; iter < iter_max; iter++) {
+	for (int iter = 0; iter < iter_max; iter++) {
 
 	for (u32 ctry = 0; ctry < dim.Height; ctry++)
 	for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -49,15 +49,15 @@ SettingsHierarchy::SettingsHierarchy(Settings *fallback)
 
 Settings *SettingsHierarchy::getLayer(int layer) const
 {
-	if (layer < 0 || layer >= layers.size())
+	if (layer < 0 || layer >= (int)layers.size())
 		throw BaseException("Invalid settings layer");
 	return layers[layer];
 }
 
 
 Settings *SettingsHierarchy::getParent(int layer) const
 {
-	assert(layer >= 0 && layer < layers.size());
+	assert(layer >= 0 && layer < (int)layers.size());
 	// iterate towards the origin (0) to find the next fallback layer
 	for (int i = layer - 1; i >= 0; --i) {
 		if (layers[i])
@@ -72,8 +72,8 @@ void SettingsHierarchy::onLayerCreated(int layer, Settings *obj)
 {
 	if (layer < 0)
 		throw BaseException("Invalid settings layer");
-	if (layers.size() < layer+1)
-		layers.resize(layer+1);
+	if ((int)layers.size() < layer + 1)
+		layers.resize(layer + 1);
 
 	Settings *&pos = layers[layer];
 	if (pos)

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,15 @@ SettingsHierarchy::SettingsHierarchy(Settings *fallback)`
`49`	`49`
`50`	`50`	`Settings *SettingsHierarchy::getLayer(int layer) const`Has conversations. Original line has conversations.
`51`	`51`	`{`
`52`		`- if (layer < 0 \|\| layer >= layers.size())`
	`52`	`+ if (layer < 0 \|\| layer >= (int)layers.size())`
`53`	`53`	`throw BaseException("Invalid settings layer");`
`54`	`54`	`return layers[layer];`
`55`	`55`	`}`
`56`	`56`
`57`	`57`
`58`	`58`	`Settings *SettingsHierarchy::getParent(int layer) const`
`59`	`59`	`{`
`60`		`- assert(layer >= 0 && layer < layers.size());`
	`60`	`+ assert(layer >= 0 && layer < (int)layers.size());`
`61`	`61`	`// iterate towards the origin (0) to find the next fallback layer`
`62`	`62`	`for (int i = layer - 1; i >= 0; --i) {`
`63`	`63`	`if (layers[i])`
`@@ -72,8 +72,8 @@ void SettingsHierarchy::onLayerCreated(int layer, Settings *obj)`
`72`	`72`	`{`
`73`	`73`	`if (layer < 0)`
`74`	`74`	`throw BaseException("Invalid settings layer");`
`75`		`- if (layers.size() < layer+1)`
`76`		`- layers.resize(layer+1);`
	`75`	`+ if ((int)layers.size() < layer + 1)`
	`76`	`+ layers.resize(layer + 1);`
`77`	`77`
`78`	`78`	`Settings *&pos = layers[layer];`
`79`	`79`	`if (pos)`