AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consider g++ ABI 1011 to be compatible with 1002 too

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin 2018-05-17 03:59:19 +02:00
parent 822809ef78
commit 610db240a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/build.h
View File

@ -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