diff options
| author | David Benjamin <davidben@google.com> | 2016-09-08 00:28:59 +0300 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2016-09-08 00:57:13 +0300 |
| commit | 3e5619d121901089e39ad5491de15bb919552a60 (patch) | |
| tree | 12808c2a724477964e234d38a7082a7447cecc90 | |
| parent | f0e935d7ce2747bc72d7968d3baa503483f68ce0 (diff) | |
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 <mab@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
| -rw-r--r-- | include/openssl/base.h | 13 |
1 files changed, 13 insertions, 0 deletions
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 <memory> + +// 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) |