[xerces-c] 13/13: XERCESC-2146 - Patch to build with older GCC

[borisk]

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

borisk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/xerces-c.git

commit 63f93ef81ab5844cf303823f8b4aa97f9d672fa0
Author: Scott Cantor <scan...@apache.org>
AuthorDate: Mon Jan 6 14:19:33 2020 +0000

    XERCESC-2146 - Patch to build with older GCC
    
    git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1872382 
13f79535-47bb-0310-9956-ffa450edef68
---
 src/xercesc/util/XMLExceptMsgs.hpp                   | 4 ++--
 src/xercesc/util/XMLUni.hpp                          | 4 ++--
 src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xercesc/util/XMLExceptMsgs.hpp 
b/src/xercesc/util/XMLExceptMsgs.hpp
index ef2951f..e4c7f70 100644
--- a/src/xercesc/util/XMLExceptMsgs.hpp
+++ b/src/xercesc/util/XMLExceptMsgs.hpp
@@ -9,7 +9,7 @@
 XERCES_CPP_NAMESPACE_BEGIN
 
 // Ignore warning about private constructor
-#ifdef __GNUC__
+#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5))
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #endif
@@ -398,7 +398,7 @@ private:
     XMLExcepts();
 };
 
-#ifdef __GNUC__
+#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5))
 #  pragma GCC diagnostic pop
 #endif
 
diff --git a/src/xercesc/util/XMLUni.hpp b/src/xercesc/util/XMLUni.hpp
index 38f3f71..078efff 100644
--- a/src/xercesc/util/XMLUni.hpp
+++ b/src/xercesc/util/XMLUni.hpp
@@ -36,7 +36,7 @@
 XERCES_CPP_NAMESPACE_BEGIN
 
 // Ignore warning about private constructor
-#ifdef __GNUC__
+#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5))
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #endif
@@ -334,7 +334,7 @@ private:
     XMLUni();
 };
 
-#ifdef __GNUC__
+#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5))
 #  pragma GCC diagnostic pop
 #endif
 
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in 
b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
index e849e08..0d99e08 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
@@ -92,7 +92,7 @@
 // ---------------------------------------------------------------------------
 //  Include standard headers, if available, that we may rely on below.
 // ---------------------------------------------------------------------------
-#if defined(__cplusplus) && defined(HAVE_CSTDINT)
+#if defined(__cplusplus) && defined(XERCES_HAVE_CSTDINT)
 #  include <cstdint>
 #endif
 #if XERCES_HAVE_STDINT_H


---------------------------------------------------------------------
To unsubscribe, e-mail: c-dev-unsubscr...@xerces.apache.org
For additional commands, e-mail: c-dev-h...@xerces.apache.org