Revert "Revert "Turn off extern templates for most uses.""

The bionic tests on x86_64 are very unhappy about this:

external/gtest/include/gtest/gtest-printers.h:245: error: undefined reference to 'std::__1::basic_ostream<char, std::__1::char_traits<char> >::operator<<(__float128)'
external/gtest/include/gtest/gtest-printers.h:245: error: undefined reference to 'std::__1::basic_ostream<char, std::__1::char_traits<char> >::operator<<(__float128)'
external/gtest/include/gtest/gtest-printers.h:245: error: undefined reference to 'std::__1::basic_ostream<char, std::__1::char_traits<char> >::operator<<(__float128)'
external/gtest/include/gtest/gtest-printers.h:245: error: undefined reference to 'std::__1::basic_ostream<char, std::__1::char_traits<char> >::operator<<(__float128)'

I'll investigate tomorrow, but for now it's easiest to just revert.

This reverts commit 98c4e404ca.
Change-Id: I4c4e83be2ca465069734c54f4dcfa539916d35e4
This commit is contained in:
Dan Albert
2014-12-03 21:33:51 -08:00
parent a3b5c78df4
commit 938c6a083b
6 changed files with 9 additions and 1 deletions

View File

@@ -609,7 +609,7 @@ template <unsigned> struct __static_assert_check {};
#endif
#ifndef _LIBCPP_EXTERN_TEMPLATE
#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
#define _LIBCPP_EXTERN_TEMPLATE(...)
#endif
#ifndef _LIBCPP_EXTERN_TEMPLATE2

View File

@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
#include "algorithm"
#include "random"
#include "mutex"

View File

@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "__config"
#include "ios"
#include "streambuf"
#include "istream"

View File

@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
#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__

View File

@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
#include "string"
#include "cstdlib"
#include "cwchar"

View File

@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
#include "valarray"
_LIBCPP_BEGIN_NAMESPACE_STD