Merge to upstream r222492.

Change-Id: I6a0a6e90d217a69531ec3bb5ca0a367f39f4a1da
2014-11-20 15:55:17 -08:00
parent 54e693ac44
commit 7112dae6ac
584 changed files with 21668 additions and 1424 deletions
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//

-#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__