[qpid-proton] branch master updated: PROTON-2132 Skip libstdc++ ABI compatibility hack with libc++

[jd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f2fdeb  PROTON-2132 Skip libstdc++ ABI compatibility hack with libc++
6f2fdeb is described below

commit 6f2fdeb633575114c5f92f1387a21eba992b422a
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Thu Nov 7 10:35:19 2019 +0100

    PROTON-2132 Skip libstdc++ ABI compatibility hack with libc++
---
 cpp/src/ssl_options.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cpp/src/ssl_options.cpp b/cpp/src/ssl_options.cpp
index 83a50bc..bd4d5c1 100644
--- a/cpp/src/ssl_options.cpp
+++ b/cpp/src/ssl_options.cpp
@@ -21,6 +21,9 @@
 
 #include "ssl_options_impl.hpp"
 
+// https://stackoverflow.com/questions/31657499/how-to-detect-stdlib-libc-in-the-preprocessor
+#include <ciso646>
+
 #include "proton/ssl.hpp"
 #include "proton/error.hpp"
 #include "msg.hpp"
@@ -150,8 +153,8 @@ ssl_certificate::ssl_certificate(const std::string &main, const std::string &ext
 // For backwards ABI compatibility we need to define some symbols:
 //
 
-// Don't do this on MacOS, FreeBSD or with Visual Studio
-#if !defined(_MSC_VER) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__)
+// Don't do this with libc++ or with Visual Studio
+#if !defined(_LIBCPP_VERSION) && !defined(_MSC_VER)
 
 //
 // These are a bit easier as the entire class has been removed so we can just define the class here


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org