[Scummvm-git-logs] scummvm master -> e75e38abaf20209286c7ec0d29401d3d30d8b7f5
OMGPizzaGuy
noreply at scummvm.org
Fri May 15 03:11:04 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e75e38abaf CXXTEST: Fix compilation on MSVC
Commit: e75e38abaf20209286c7ec0d29401d3d30d8b7f5
https://github.com/scummvm/scummvm/commit/e75e38abaf20209286c7ec0d29401d3d30d8b7f5
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2026-05-14T22:10:53-05:00
Commit Message:
CXXTEST: Fix compilation on MSVC
This would give an error C4805: '==': unsafe mix of type 'X' and type 'Y' in operation with X=bool and Y=int
This is a reimplentation of commit 25e5e17 for cxxtest-4
Changed paths:
test/cxxtest/cxxtest/TestSuite.h
diff --git a/test/cxxtest/cxxtest/TestSuite.h b/test/cxxtest/cxxtest/TestSuite.h
index 47d6255bbee..e4d1bb481ca 100644
--- a/test/cxxtest/cxxtest/TestSuite.h
+++ b/test/cxxtest/cxxtest/TestSuite.h
@@ -66,6 +66,15 @@ struct equals
}
};
+template<>
+struct equals<bool, int>
+{
+ static bool test(bool x, int y)
+ {
+ return (x == (bool)y);
+ }
+};
+
template<>
struct equals<const char*, const char*>
{
More information about the Scummvm-git-logs
mailing list