From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 19 Aug 2016 08:41:57 +0000 (+0200)
Subject: [4553] Patch updated to cover all versions up to 6.0
X-Git-Tag: trac4631_base~21^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bdbd723db0c51622cb753c5cac7063885767ead;p=thirdparty%2Fkea.git

[4553] Patch updated to cover all versions up to 6.0
---

diff --git a/src/lib/asiolink/asio_wrapper.h b/src/lib/asiolink/asio_wrapper.h
index 63b055f5d7..7c6fda9a04 100644
--- a/src/lib/asiolink/asio_wrapper.h
+++ b/src/lib/asiolink/asio_wrapper.h
@@ -46,15 +46,19 @@
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69789
 // https://svn.boost.org/trac/boost/ticket/11989
 //
-// @todo Currently, 5.3.0 is the latest released versio of GCC. Version 6.0 is
+// @todo Currently, 5.3.0 is the latest released version of GCC. Version 6.0 is
 // in development and will need to be tested.
+//
+// As of 2016-08-19, the version 5.4.0 from Ubuntu 16.04 is affected. Updated
+// the check to cover everything that is not 6.0, hoping that 6.0 solves the
+// problem.
 
 #define GNU_CC_VERSION (__GNUC__ * 10000 \
                      + __GNUC_MINOR__ * 100 \
                      + __GNUC_PATCHLEVEL__)
 
 #if (defined(__GNUC__) && \
-    ((GNU_CC_VERSION >= 50200) && (GNU_CC_VERSION <= 50401)) \
+    ((GNU_CC_VERSION >= 50200) && (GNU_CC_VERSION < 60000)) \
     && defined(BOOST_ERROR_CODE_HEADER_ONLY))
 #pragma GCC push_options
 #pragma GCC optimize ("O0")