diff --git a/headers/tools/cppunit/cppunit/TestAssert.h b/headers/tools/cppunit/cppunit/TestAssert.h
index d4f1315cdd..c20491022b 100644
--- a/headers/tools/cppunit/cppunit/TestAssert.h
+++ b/headers/tools/cppunit/cppunit/TestAssert.h
@@ -173,7 +173,7 @@ namespace CppUnit {
  * removed by specializing the CppUnit::assertion_traits.
  */
 #define CPPUNIT_ASSERT_EQUAL(expected,actual)                     \
-  ( ::CppUnit::TestAssert::assertEquals( (expected),              \
+  ( ::CppUnit::TestAssert::assertEquals<typeof(expected)>( (expected), \
                                          (actual),                \
                                          CPPUNIT_SOURCELINE() ) )
 
@@ -196,7 +196,7 @@ namespace CppUnit {
  * removed by specializing the CppUnit::assertion_traits.
  */
 #define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual)     \
-  ( ::CppUnit::TestAssert::assertEquals( (expected),              \
+  ( ::CppUnit::TestAssert::assertEquals<typeof(expected)>( (expected),  \
                                          (actual),                \
                                          CPPUNIT_SOURCELINE(),    \
                                          (message) ) )