diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-02-13 09:14:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-13 09:14:23 +0000 |
| commit | 95f770d2eda637ad56fbd24946fd94f31acc589f (patch) | |
| tree | 68dd5a0742d8289dd783b34707424985a65b7eec | |
| parent | 48a3fead9e0fc283553b31205cdc346d741fdf06 (diff) | |
| parent | 02ad8ad9214145f918020b17fb9a0f0d3f86dd46 (diff) | |
| download | external_libcxx-95f770d2eda637ad56fbd24946fd94f31acc589f.tar.gz external_libcxx-95f770d2eda637ad56fbd24946fd94f31acc589f.tar.bz2 external_libcxx-95f770d2eda637ad56fbd24946fd94f31acc589f.zip | |
Revert "Revert "Revert "Turn off extern templates for most uses."""
am: 02ad8ad921
Change-Id: I9086939bd3b7aa7e638ca0047eaf111a648a774a
| -rw-r--r-- | include/__config | 2 | ||||
| -rw-r--r-- | src/algorithm.cpp | 2 | ||||
| -rw-r--r-- | src/ios.cpp | 3 | ||||
| -rw-r--r-- | src/locale.cpp | 3 | ||||
| -rw-r--r-- | src/string.cpp | 3 | ||||
| -rw-r--r-- | src/valarray.cpp | 3 |
6 files changed, 1 insertions, 15 deletions
diff --git a/include/__config b/include/__config index ecc668bca..a4acbcaf1 100644 --- a/include/__config +++ b/include/__config @@ -905,7 +905,7 @@ template <unsigned> struct __static_assert_check {}; #endif #ifndef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) +#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; #endif #ifndef _LIBCPP_EXTERN_TEMPLATE2 diff --git a/src/algorithm.cpp b/src/algorithm.cpp index 132a51de0..f036eb7ab 100644 --- a/src/algorithm.cpp +++ b/src/algorithm.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -#undef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; #include "algorithm" #include "random" #include "mutex" diff --git a/src/ios.cpp b/src/ios.cpp index c1d232778..0f1d88e37 100644 --- a/src/ios.cpp +++ b/src/ios.cpp @@ -9,9 +9,6 @@ #include "__config" -#undef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; - #include "ios" #include <stdlib.h> diff --git a/src/locale.cpp b/src/locale.cpp index bea7ba36f..11f864a2f 100644 --- a/src/locale.cpp +++ b/src/locale.cpp @@ -7,9 +7,6 @@ // //===----------------------------------------------------------------------===// -#undef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; - // On Solaris, we need to define something to make the C99 parts of localeconv // visible. #ifdef __sun__ diff --git a/src/string.cpp b/src/string.cpp index 6a175f221..d7ebdd3e5 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -7,9 +7,6 @@ // //===----------------------------------------------------------------------===// -#undef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; - #include "string" #include "cstdlib" #include "cwchar" diff --git a/src/valarray.cpp b/src/valarray.cpp index f6745dff4..2d8db52ac 100644 --- a/src/valarray.cpp +++ b/src/valarray.cpp @@ -7,9 +7,6 @@ // //===----------------------------------------------------------------------===// -#undef _LIBCPP_EXTERN_TEMPLATE -#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; - #include "valarray" _LIBCPP_BEGIN_NAMESPACE_STD |