From 3e5619d121901089e39ad5491de15bb919552a60 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 7 Sep 2016 17:28:59 -0400 Subject: [PATCH] Blacklist STLPort from C++ scopers. It lacks std::unique_ptr, despite some consumers using it with C++11 in the compiler enabled. Change-Id: Icc79ac4f2385440b36aa6b01b1477abcfa8a9388 Reviewed-on: https://boringssl-review.googlesource.com/10841 Reviewed-by: Matt Braithwaite Reviewed-by: David Benjamin Commit-Queue: David Benjamin CQ-Verified: CQ bot account: commit-bot@chromium.org --- include/openssl/base.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/openssl/base.h b/include/openssl/base.h index bfb4ea84..ff3f7eea 100644 --- a/include/openssl/base.h +++ b/include/openssl/base.h @@ -307,6 +307,19 @@ typedef void *OPENSSL_BLOCK; #define BORINGSSL_NO_CXX #endif +#if !defined(BORINGSSL_NO_CXX) +extern "C++" { + +#include + +// STLPort, used by some Android consumers, not have std::unique_ptr. +#if defined(_STLPORT_VERSION) +#define BORINGSSL_NO_CXX +#endif + +} // extern C++ +#endif // !BORINGSSL_NO_CXX + #if defined(BORINGSSL_NO_CXX) #define BORINGSSL_MAKE_DELETER(type, deleter)