From 610db240a8c8c36672f44e34fb0b368b983f1473 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 May 2018 03:59:19 +0200 Subject: [PATCH] Consider g++ ABI 1011 to be compatible with 1002 too The changes between 1010 (which was already considered equivalent to 1002) and 1011 don't seem to affect wxWidgets and the library compiled with g++6 can be used from the application built with g++7 without any problems. --- include/wx/build.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/build.h b/include/wx/build.h index ec4be87bda..82c38a29b5 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -52,11 +52,11 @@ // GCC and Intel C++ share same C++ ABI (and possibly others in the future), // check if compiler versions are compatible: #if defined(__GXX_ABI_VERSION) - // The changes between ABI versions 1002 through 1010 (documented at + // The changes between ABI versions 1002 through 1011 (documented at // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html // under -fabi-version) don't affect wxWidgets, so we allow a library // and an application to differ within that range. - #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010)) + #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1011)) #define wxGXX_EFFECTIVE_ABI_VERSION 1002 #else #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION