From 7f140c7058affee3e6782b36ff8edd1751847025 Mon Sep 17 00:00:00 2001 From: Steven Penny Date: Sun, 25 Jun 2017 12:29:32 -0500 Subject: [PATCH] catchiofailure: defined _GLIBCXX_USE_CXX11_ABI first to cover GCC 5 Fix #7 --- io/catchiofailure.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/io/catchiofailure.cpp b/io/catchiofailure.cpp index 2dd382d..6c84986 100644 --- a/io/catchiofailure.cpp +++ b/io/catchiofailure.cpp @@ -1,12 +1,12 @@ -// include libstd++ specific header containing _GLIBCXX_RELEASE +#define _GLIBCXX_USE_CXX11_ABI 0 +// include libstd++ specific header containing __GLIBCXX__ // without including ios already (must be included after setting _GLIBCXX_USE_CXX11_ABI) -#include +#include // 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"