[Scummvm-git-logs] scummvm master -> f41cf652eb8aa64b2c49200f9bffc5a98a35afc2

[lephilousophe]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
509043aa92 TEST: Fix warning about signedness
4a8cfd6d0b TEST: Fix missing include
f41cf652eb TEST: Fix warnings


Commit: 509043aa92b5b6beb3a7c92e9268e7f27ca6ee0f
    https://github.com/scummvm/scummvm/commit/509043aa92b5b6beb3a7c92e9268e7f27ca6ee0f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-08-30T13:41:19+02:00

Commit Message:
TEST: Fix warning about signedness

Changed paths:
    test/common/array.h


diff --git a/test/common/array.h b/test/common/array.h
index 36f58dceb4e..e1538ca0734 100644
--- a/test/common/array.h
+++ b/test/common/array.h
@@ -439,20 +439,20 @@ class ArrayTestSuite : public CxxTest::TestSuite
 		array2.push_back(5);
 		array2.push_back(9);
 
-		TS_ASSERT_EQUALS(array1.size(), 3);
+		TS_ASSERT_EQUALS(array1.size(), 3u);
 		TS_ASSERT_EQUALS(array1[0], -3);
 		TS_ASSERT_EQUALS(array1[1], 163);
 		TS_ASSERT_EQUALS(array1[2], 17);
-		TS_ASSERT_EQUALS(array2.size(), 2);
+		TS_ASSERT_EQUALS(array2.size(), 2u);
 		TS_ASSERT_EQUALS(array2[0], 5);
 		TS_ASSERT_EQUALS(array2[1], 9);
 
 		array1.swap(array2);
 
-		TS_ASSERT_EQUALS(array1.size(), 2);
+		TS_ASSERT_EQUALS(array1.size(), 2u);
 		TS_ASSERT_EQUALS(array1[0], 5);
 		TS_ASSERT_EQUALS(array1[1], 9);
-		TS_ASSERT_EQUALS(array2.size(), 3);
+		TS_ASSERT_EQUALS(array2.size(), 3u);
 		TS_ASSERT_EQUALS(array2[0], -3);
 		TS_ASSERT_EQUALS(array2[1], 163);
 		TS_ASSERT_EQUALS(array2[2], 17);


Commit: 4a8cfd6d0b271be86d23a2f33d6215811007071e
    https://github.com/scummvm/scummvm/commit/4a8cfd6d0b271be86d23a2f33d6215811007071e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-08-30T13:41:26+02:00

Commit Message:
TEST: Fix missing include

Changed paths:
    test/image/blending.h


diff --git a/test/image/blending.h b/test/image/blending.h
index 6efa1b8dcf5..31d3ffed8c4 100644
--- a/test/image/blending.h
+++ b/test/image/blending.h
@@ -45,6 +45,8 @@
 #include "graphics/transparent_surface.h"
 #include "graphics/transform_tools.h"
 
+#include "../null_osystem.h"
+
 #if NULL_OSYSTEM_IS_AVAILABLE
 #define BENCHMARK_TIME 1
 #else


Commit: f41cf652eb8aa64b2c49200f9bffc5a98a35afc2
    https://github.com/scummvm/scummvm/commit/f41cf652eb8aa64b2c49200f9bffc5a98a35afc2
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-08-30T13:41:34+02:00

Commit Message:
TEST: Fix warnings

Changed paths:
    test/common/span.h


diff --git a/test/common/span.h b/test/common/span.h
index ca181c64876..7e6e2e24625 100644
--- a/test/common/span.h
+++ b/test/common/span.h
@@ -659,7 +659,7 @@ public:
 		TS_ASSERT(span.checkInvalidBounds(2, -4)); // negative overflow (-2)
 		TS_ASSERT(span.checkInvalidBounds(0, 10)); // delta positive overflow
 
-		const Common::Span<byte>::difference_type big = 1L << (8 * sizeof(Common::Span<byte>::difference_type) - 1);
+		const Common::Span<byte>::difference_type big = (Common::Span<byte>::difference_type)1 << (8 * sizeof(Common::Span<byte>::difference_type) - 1);
 		TS_ASSERT(span.checkInvalidBounds(big, 0));
 		TS_ASSERT(span.checkInvalidBounds(0, big));
 		TS_ASSERT(span.checkInvalidBounds(big, big));
@@ -687,7 +687,7 @@ public:
 	}
 
 	void test_span_comparators() {
-		byte data[2];
+		byte data[2] = { 0 };
 		Common::Span<const byte> span0(data, sizeof(data));
 		Common::Span<const byte> span1(data, sizeof(data));
 		Common::Span<const byte> span2(data, sizeof(data) - 1);