Revert scoped_types.h change.
This reverts commits:
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
19fdcb523402ed13ab798cf811fb0119e3e7b104
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
Because WebRTC (at least) includes our headers in an extern "C" block,
which precludes having any C++ in them.
Change-Id: Ia849f43795a40034cbd45b22ea680b51aab28b2d
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index b149c45..32aded6 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -353,26 +353,14 @@
OPENSSL_EXPORT size_t EC_get_builtin_curves(EC_builtin_curve *out_curves,
size_t max_num_curves);
+/* Old code expects to get EC_KEY from ec.h. */
+#include <openssl/ec_key.h>
+
#if defined(__cplusplus)
} /* extern C */
-
-#if defined(BORINGSSL_HAVE_CXX11)
-
-namespace bssl {
-
-using ScopedEC_GROUP = ScopedType<EC_GROUP, EC_GROUP_free>;
-using ScopedEC_POINT = ScopedType<EC_POINT, EC_POINT_free>;
-
-} // namespace bssl
-
#endif
-#endif
-
-/* Old code expects to get EC_KEY from ec.h. */
-#include <openssl/ec_key.h>
-
#define EC_R_BUFFER_TOO_SMALL 100
#define EC_R_COORDINATES_OUT_OF_RANGE 101
#define EC_R_D2I_ECPKPARAMETERS_FAILURE 102
