# HG changeset patch # User Sebastien Jodogne # Date 1460372022 -7200 # Node ID 5e40f88f4eba4ff3088eec23401bb0c2f665c59d # Parent e7ae0185b77e4bf96b547e0d5edf32b354d7f880 fix for old versions of mingw diff -r e7ae0185b77e -r 5e40f88f4eba Resources/CMake/Compiler.cmake --- a/Resources/CMake/Compiler.cmake Mon Apr 11 12:40:25 2016 +0200 +++ b/Resources/CMake/Compiler.cmake Mon Apr 11 12:53:42 2016 +0200 @@ -103,8 +103,8 @@ if (CMAKE_COMPILER_IS_GNUCXX) # Some additional C/C++ compiler flags for MinGW - SET(MINGW_NO_WARNINGS "-Wno-int-to-pointer-cast -Wno-unused-function -Wno-unused-variable") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MINGW_NO_WARNINGS} -Wno-pointer-to-int-cast -Wno-unused-but-set-variable") + SET(MINGW_NO_WARNINGS "-Wno-unused-function -Wno-unused-variable") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MINGW_NO_WARNINGS} -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MINGW_NO_WARNINGS}") # This is a patch for MinGW64 diff -r e7ae0185b77e -r 5e40f88f4eba UnitTestsSources/UnitTestsMain.cpp --- a/UnitTestsSources/UnitTestsMain.cpp Mon Apr 11 12:40:25 2016 +0200 +++ b/UnitTestsSources/UnitTestsMain.cpp Mon Apr 11 12:53:42 2016 +0200 @@ -563,9 +563,9 @@ ASSERT_EQ(true, Toolbox::ReadHeader(h, path.c_str(), 1)); ASSERT_EQ(1, h.size()); ASSERT_EQ('H', h[0]); - ASSERT_EQ(true, Toolbox::ReadHeader(h, path.c_str(), 0)); + ASSERT_TRUE(Toolbox::ReadHeader(h, path.c_str(), 0)); ASSERT_EQ(0, h.size()); - ASSERT_EQ(false, Toolbox::ReadHeader(h, path.c_str(), 32)); + ASSERT_FALSE(Toolbox::ReadHeader(h, path.c_str(), 32)); ASSERT_EQ(11u, h.size()); ASSERT_EQ(0, memcmp(s.c_str(), h.c_str(), s.size())); }