Merge pull request #7 from svnpenn/master

catchiofailure.cpp: "_GLIBCXX_USE_CXX11_ABI" redefined
This commit is contained in:
Martchus 2017-06-25 19:47:42 +02:00 committed by GitHub
commit 94136d9b85
1 changed files with 5 additions and 5 deletions

View File

@ -1,12 +1,12 @@
// include libstd++ specific header <bits/c++config.h> containing _GLIBCXX_RELEASE
#define _GLIBCXX_USE_CXX11_ABI 0
// include libstd++ specific header <bits/c++config.h> containing __GLIBCXX__
// without including ios already (must be included after setting _GLIBCXX_USE_CXX11_ABI)
#include <cctype>
#include <cstddef>
// ensure the old ABI is used under libstd++ < 7 and the new ABI under libstd++ >= 7
#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7
#if __GLIBCXX__ >= 20170502
#undef _GLIBCXX_USE_CXX11_ABI
#define _GLIBCXX_USE_CXX11_ABI 1
#else
#define _GLIBCXX_USE_CXX11_ABI 0
#endif
#include "./catchiofailure.h"