[nifi-minifi-cpp] branch master updated: MINIFICPP-1239 Use except in gcc < 4.9

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new b6ebce7  MINIFICPP-1239 Use <regex> except in gcc < 4.9
b6ebce7 is described below

commit b6ebce7101ad32c9c9941b99d84fc30c14d55cf2
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Tue May 26 11:31:17 2020 +0200

    MINIFICPP-1239 Use <regex> except in gcc < 4.9
    
    Signed-off-by: Arpad Boda <ab...@apache.org>
    
    This closes #796
---
 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 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 {