diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-08-29 23:37:50 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-08-29 23:37:50 +0000 |
| commit | 976241362128b4e33fbf3b36a91acb6309edb205 (patch) | |
| tree | bb5a20691c18ffcad156f9df09b8f83435d7517a /libcxx | |
| parent | e0064d8c246afc2b158fd714c5bdb68b4d2b1804 (diff) | |
| download | bcm5719-llvm-976241362128b4e33fbf3b36a91acb6309edb205.tar.gz bcm5719-llvm-976241362128b4e33fbf3b36a91acb6309edb205.zip | |
Xing Xue: Some minor changes for IBM XLC++/AIX.
llvm-svn: 189623
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/__locale | 2 | ||||
| -rw-r--r-- | libcxx/include/support/ibm/xlocale.h | 2 | ||||
| -rw-r--r-- | libcxx/src/locale.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libcxx/include/__locale b/libcxx/include/__locale index 2c144d20585..2390768ccca 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -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; diff --git a/libcxx/include/support/ibm/xlocale.h b/libcxx/include/support/ibm/xlocale.h index fa349e0d416..8d99a5c7d34 100644 --- a/libcxx/include/support/ibm/xlocale.h +++ b/libcxx/include/support/ibm/xlocale.h @@ -263,8 +263,6 @@ size_t wcsxfrm_l(wchar_t *__ws1, const wchar_t *__ws2, size_t __n, } #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 diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index 49ffd8e0246..3f6d246e31a 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -109,6 +109,11 @@ countof(const T * const begin, const T * const end) } +#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; |
