From f51b9745567c3a05c7e423c04bae2b3256d9411d Mon Sep 17 00:00:00 2001
From: dthoennes <dominik.thoennes@fau.de>
Date: Wed, 8 Nov 2017 10:13:12 +0100
Subject: [PATCH] fixed regex wrap for gcc 4.8
---
CMakeLists.txt | 2 +-
src/core/Regex.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ee98aed1..ba5cdfcfd 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 4d4f167a5..85eeba2be 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;
--
GitLab