From af2b1e8210dc2678aff0e0cf0f8cfad2ffbdb619 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 27 Jul 2017 14:05:20 -0400 Subject: [PATCH] C++ headers should be more aggressively wrapped in extern "C++". This is kind of a mess. Some projects will wrap our public headers in extern "C", so we use extern "C++" around our C++ APIs. However this needs to be done when including C++ standard library headers too since they don't always, themselves, guard against being wrapped in extern "C". Change-Id: Ib7dd4a6f69ca81dd525ecaa1418b3b7ba85b6579 Reviewed-on: https://boringssl-review.googlesource.com/18504 Reviewed-by: Adam Langley --- include/openssl/span.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/openssl/span.h b/include/openssl/span.h index c21f4442..4c091595 100644 --- a/include/openssl/span.h +++ b/include/openssl/span.h @@ -19,13 +19,11 @@ #if !defined(BORINGSSL_NO_CXX) +extern "C++" { + #include #include -#include "../crypto/internal.h" - -extern "C++" { - namespace bssl { template