commit e59f724f79c5388d6b0a7794fd6d610783bec62d
author Sean Hunt <scshunt@csclub.uwaterloo.ca> Sat Jul 09 01:09:31 2011 +0000
committer Sean Hunt <scshunt@csclub.uwaterloo.ca> Sat Jul 09 01:09:31 2011 +0000
tree ad8f3156818373ce7c933d3e7b961b0c134d2e65
parent 62a6ac33a217b0e5a4c42367c6b72e51497246ae

Conditionally wrap the changes from r134781.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134783 91177308-0d34-0410-b5e6-96231b3b80d8

src/locale.cpp

diff --git a/src/locale.cpp b/src/locale.cpp
index eafd763..63f5429 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -116,6 +116,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+#ifndef _LIBCPP_APPLE_STABLE_ABI
 locale_t __cloc() {
   // In theory this could create a race condition. In practice
   // the race condition is non-fatal since it will just create
@@ -127,6 +128,7 @@
   return result;
 #endif
 }
+#endif // _LIBCPP_APPLE_STABLE_ABI
 
 namespace {
 
@@ -812,30 +814,46 @@
 wchar_t
 ctype<wchar_t>::do_toupper(char_type c) const
 {
+#ifndef _LIBCPP_STABLE_APPLE_ABI
     return isascii(c) ? ctype<char>::__classic_upper_table()[c] : c;
+#else
+    return isascii(c) ? _DefaultRuneLocale.__mapupper[c] : c;
+#endif
 }
 
 const wchar_t*
 ctype<wchar_t>::do_toupper(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
+#ifndef _LIBCPP_STABLE_APPLE_ABI
         *low = isascii(*low) ? ctype<char>::__classic_upper_table()[*low]
                              : *low;
+#else
+        *low = isascii(*low) ? _DefaultRuneLocale.__mapupper[*low] : *low;
+#endif
     return low;
 }
 
 wchar_t
 ctype<wchar_t>::do_tolower(char_type c) const
 {
+#ifndef _LIBCPP_STABLE_APPLE_ABI
     return isascii(c) ? ctype<char>::__classic_lower_table()[c] : c;
+#else
+    return isascii(c) ? _DefaultRuneLocale.__maplower[c] : c;
+#endif
 }
 
 const wchar_t*
 ctype<wchar_t>::do_tolower(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
+#ifndef _LIBCPP_STABLE_APPLE_ABI
         *low = isascii(*low) ? ctype<char>::__classic_lower_table()[*low]
                              : *low;
+#else
+        *low = isascii(*low) ? _DefaultRuneLocale.__maplower[*low] : *low;
+#endif
     return low;
 }
 
@@ -894,28 +912,44 @@
 char
 ctype<char>::do_toupper(char_type c) const
 {
+#ifndef _LIBCPP_STABLE_APPLE_ABI
     return isascii(c) ? __classic_upper_table()[c] : c;
+#else
+    return isascii(c) ? _DefaultRuneLocale.__mapupper[c] : c;
+#endif
 }
 
 const char*
 ctype<char>::do_toupper(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
+#ifndef _LIBCPP_STABLE_APPLE_ABI
         *low = isascii(*low) ? __classic_upper_table()[*low] : *low;
+#else
+        *low = isascii(*low) ? _DefaultRuneLocale.__mapupper[c] : c;
+#endif
     return low;
 }
 
 char
 ctype<char>::do_tolower(char_type c) const
 {
+#ifndef _LIBCPP_STABLE_APPLE_ABI
     return isascii(c) ? __classic_lower_table()[c] : c;
+#else
+    return isascii(c) ? _DefaultRuneLocale.__maplower[c] : c;
+#endif
 }
 
 const char*
 ctype<char>::do_tolower(char_type* low, const char_type* high) const
 {
     for (; low != high; ++low)
+#ifndef _LIBCPP_STABLE_APPLE_ABI
         *low = isascii(*low) ? __classic_lower_table()[*low] : *low;
+#else
+        *low = isascii(*low) ? _DefaultRuneLocale.__maplower[c] : c;
+#endif
     return low;
 }
 
@@ -965,6 +999,7 @@
 #endif
 }
 
+#ifndef _LIBCPP_APPLE_STABLE_ABI
 const int*
 ctype<char>::__classic_lower_table() _NOEXCEPT
 {
@@ -988,6 +1023,7 @@
     return NULL;
 #endif
 }
+#endif // _LIBCPP_APPLE_STABLE_ABI
 
 // template <> class ctype_byname<char>