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

[sev-]

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

Summary:
f2f64161a1 TESTS: Fix GCC warnings


Commit: f2f64161a10b3258e5491e2c477092bdd5a4da11
    https://github.com/scummvm/scummvm/commit/f2f64161a10b3258e5491e2c477092bdd5a4da11
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-23T01:54:26+02:00

Commit Message:
TESTS: Fix GCC warnings

../scummvm/test/cxxtest/cxxtest/ValueTraits.h:120:52: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
  120 |         ValueTraits( CXXTEST_NEW_CLASS n ) : _old( (CXXTEST_OLD_CLASS)n ) {} \
      |                                                    ^~~~~~~~~~~~~~~~~~~~

Changed paths:
    test/cxxtest/cxxtest/ValueTraits.h


diff --git a/test/cxxtest/cxxtest/ValueTraits.h b/test/cxxtest/cxxtest/ValueTraits.h
index 45b2ea39c1..2a0ffaa147 100644
--- a/test/cxxtest/cxxtest/ValueTraits.h
+++ b/test/cxxtest/cxxtest/ValueTraits.h
@@ -20,6 +20,15 @@
 
 namespace CxxTest
 {
+    /// remove_const
+    template<typename T>
+    struct remove_const
+    { typedef T type; };
+
+    template<typename T>
+    struct remove_const<T const>
+    { typedef T type; };
+
     //
     // This is how we use the value traits
     //
@@ -100,7 +109,7 @@ namespace CxxTest
     { \
         ValueTraits< CXXTEST_OLD_CLASS > _old; \
     public: \
-        ValueTraits( CXXTEST_NEW_CLASS n ) : _old( (CXXTEST_OLD_CLASS)n ) {} \
+        ValueTraits( CXXTEST_NEW_CLASS n ) : _old( static_cast<remove_const<CXXTEST_OLD_CLASS>::type>(n) ) {} \
         const char *asString( void ) const { return _old.asString(); } \
     }