Author: scantor
Date: Mon Jan 6 14:19:33 2020
New Revision: 1872382
URL: http://svn.apache.org/viewvc?rev=1872382&view=rev
Log:
XERCESC-2146 - Patch to build with older GCC
Modified:
xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp
xerces/c/trunk/src/xercesc/util/XMLUni.hpp
xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
Modified: xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp?rev=1872382&r1=1872381&r2=1872382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLExceptMsgs.hpp Mon Jan 6 14:19:33 2020
@@ -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
Modified: xerces/c/trunk/src/xercesc/util/XMLUni.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUni.hpp?rev=1872382&r1=1872381&r2=1872382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUni.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUni.hpp Mon Jan 6 14:19:33 2020
@@ -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
Modified: xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in?rev=1872382&r1=1872381&r2=1872382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
(original)
+++ xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in Mon Jan
6 14:19:33 2020
@@ -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: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
