From e3c0b45123108444da101b683957c320dd1ba758 Mon Sep 17 00:00:00 2001 From: Ferenc Gerlits Date: Tue, 26 May 2020 11:31:17 +0200 Subject: [PATCH] MINIFICPP-1239 Use except in gcc < 4.9 --- libminifi/include/utils/RegexUtils.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libminifi/include/utils/RegexUtils.h b/libminifi/include/utils/RegexUtils.h index 4f7e2c67d9..ff3e2d1af7 100644 --- a/libminifi/include/utils/RegexUtils.h +++ b/libminifi/include/utils/RegexUtils.h @@ -19,15 +19,14 @@ #ifndef LIBMINIFI_INCLUDE_IO_REGEXUTILS_H_ #define LIBMINIFI_INCLUDE_IO_REGEXUTILS_H_ +#include #include -#include - -#if (__cplusplus > 201103L) || defined(_WIN32) -#define NO_MORE_REGFREEE -#endif -#ifndef NO_MORE_REGFREEE +#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)) #include +#else +#include +#define NO_MORE_REGFREEE #endif namespace org {