[libcxx] r189623 - Xing Xue: Some minor changes for IBM XLC++/AIX.

[Howard Hinnant]

Author: hhinnant
Date: Thu Aug 29 18:37:50 2013
New Revision: 189623

URL: http://llvm.org/viewvc/llvm-project?rev=189623&view=rev
Log:
Xing Xue: Some minor changes for IBM XLC++/AIX.

Modified:
    libcxx/trunk/include/__locale
    libcxx/trunk/include/support/ibm/xlocale.h
    libcxx/trunk/src/locale.cpp

Modified: libcxx/trunk/include/__locale
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__locale?rev=189623&r1=189622&r2=189623&view=diff
==============================================================================
--- libcxx/trunk/include/__locale (original)
+++ libcxx/trunk/include/__locale Thu Aug 29 18:37:50 2013
@@ -363,7 +363,7 @@ public:
 # else
     static const mask blank  = _CTYPE_B;
 # endif
-#elif defined(__sun__)
+#elif defined(__sun__) && defined(_AIX)
     typedef unsigned int mask;
     static const mask space  = _ISSPACE;
     static const mask print  = _ISPRINT;

Modified: libcxx/trunk/include/support/ibm/xlocale.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/support/ibm/xlocale.h?rev=189623&r1=189622&r2=189623&view=diff
==============================================================================
--- libcxx/trunk/include/support/ibm/xlocale.h (original)
+++ libcxx/trunk/include/support/ibm/xlocale.h Thu Aug 29 18:37:50 2013
@@ -263,8 +263,6 @@ size_t wcsxfrm_l(wchar_t *__ws1, const w
 }
 #endif // !defined(_AIX71)
 
-locale_t cloc(void);
-
 // strftime_l() is defined by POSIX. However, AIX 7.1 does not have it
 // implemented yet.
 static inline

Modified: libcxx/trunk/src/locale.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/locale.cpp?rev=189623&r1=189622&r2=189623&view=diff
==============================================================================
--- libcxx/trunk/src/locale.cpp (original)
+++ libcxx/trunk/src/locale.cpp Thu Aug 29 18:37:50 2013
@@ -109,6 +109,11 @@ countof(const T * const begin, const T *
 
 }
 
+#if defined(_AIX)
+// Set priority to INT_MIN + 256 + 150
+# pragma priority ( -2147483242 )
+#endif
+
 const locale::category locale::none;
 const locale::category locale::collate;
 const locale::category locale::ctype;