diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ee98aed1f10105cb528cec3ab58e2d73668431b..ba5cdfcfd54049ba777f9097eec22f6a92ec8304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -599,7 +599,7 @@ else () endif () if (( WALBERLA_CXX_COMPILER_IS_IBM ) OR - ( WALBERLA_CXX_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION EQUAL 4.7 ) OR + ( WALBERLA_CXX_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9 ) OR ( WALBERLA_CXX_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 ) ) list ( APPEND waLBerla_REQUIRED_BOOST_COMPONENTS regex) endif() diff --git a/src/core/Regex.h b/src/core/Regex.h index 4d4f167a556b182a7969c79b463e56d21bcb3487..85eeba2be889b3e4d7968d9a62acfff4f67ea2d3 100644 --- a/src/core/Regex.h +++ b/src/core/Regex.h @@ -26,7 +26,7 @@ #include <boost/regex.hpp> #elif ( defined WALBERLA_CXX_COMPILER_IS_CLANG ) && ( ( __clang_major__ == 3 ) && ( __clang_minor__ <= 4 ) ) #include <boost/regex.hpp> -#elif ( defined WALBERLA_CXX_COMPILER_IS_GNU ) && ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ <= 7 ) ) +#elif ( defined WALBERLA_CXX_COMPILER_IS_GNU ) && ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ <= 8 ) ) #include <boost/regex.hpp> #else #include <regex> @@ -47,7 +47,7 @@ using boost::regex_match; using boost::regex_error; using boost::regex_search; using boost::regex_replace; -#elif ( defined WALBERLA_CXX_COMPILER_IS_GNU ) && ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ <= 7 ) ) +#elif ( defined WALBERLA_CXX_COMPILER_IS_GNU ) && ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ <= 8 ) ) using boost::regex; using boost::regex_match; using boost::regex_error;