commit b6ebce7101ad32c9c9941b99d84fc30c14d55cf2
author Ferenc Gerlits <fgerlits@gmail.com> Tue May 26 11:31:17 2020 +0200
committer Arpad Boda <aboda@apache.org> Tue May 26 14:06:22 2020 +0200
tree e620130e10ede479dc454e5bd209fb10e9763ade
parent 29460fa1a035096b251a7f2a323ddffcec2c4210

MINIFICPP-1239 Use <regex> except in gcc < 4.9

Signed-off-by: Arpad Boda <aboda@apache.org>

This closes #796

libminifi/include/utils/RegexUtils.h

diff --git a/libminifi/include/utils/RegexUtils.h b/libminifi/include/utils/RegexUtils.h
index 4f7e2c6..ff3e2d1 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 <string>
 #include <vector>
-#include <regex>
 
-#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 <regex.h>
+#else
+#include <regex>
+#define NO_MORE_REGFREEE
 #endif
 
 namespace org {