kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix BORINGSSL_NO_CXX.

Browse Source 
BSSL_NAMESPACE_BEGIN needs to be defined unconditionally.

Change-Id: I1770ca6b6c19f9c732ef00ba8c89b112b421929d
Reviewed-on: https://boringssl-review.googlesource.com/31824
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2018-09-11 01:18:50 -05:00 committed by Adam Langley
parent bef6cc2933
commit 689019fe40
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/openssl/base.h
View File

@ -370,15 +370,6 @@ typedef void *OPENSSL_BLOCK;
#define BORINGSSL_NO_CXX #define BORINGSSL_NO_CXX
#endif #endif
// MSVC doesn't set __cplusplus to 201103 to indicate C++11 support (see
// https://connect.microsoft.com/VisualStudio/feedback/details/763051/a-value-of-predefined-macro-cplusplus-is-still-199711l)
// so MSVC is just assumed to support C++11.
#if !defined(BORINGSSL_NO_CXX) && __cplusplus < 201103L && !defined(_MSC_VER)
#define BORINGSSL_NO_CXX
#endif
#if !defined(BORINGSSL_NO_CXX)
#if defined(BORINGSSL_PREFIX) #if defined(BORINGSSL_PREFIX)
#define BSSL_NAMESPACE_BEGIN \ #define BSSL_NAMESPACE_BEGIN \
namespace bssl { \ namespace bssl { \
@ -391,6 +382,15 @@ typedef void *OPENSSL_BLOCK;
#define BSSL_NAMESPACE_END } #define BSSL_NAMESPACE_END }
#endif #endif
// MSVC doesn't set __cplusplus to 201103 to indicate C++11 support (see
// https://connect.microsoft.com/VisualStudio/feedback/details/763051/a-value-of-predefined-macro-cplusplus-is-still-199711l)
// so MSVC is just assumed to support C++11.
#if !defined(BORINGSSL_NO_CXX) && __cplusplus < 201103L && !defined(_MSC_VER)
#define BORINGSSL_NO_CXX
#endif
#if !defined(BORINGSSL_NO_CXX)
extern "C++" { extern "C++" {
#include <memory> #include <memory>