diff options
| -rw-r--r-- | libcxx/include/__config | 3 | ||||
| -rw-r--r-- | libcxx/include/support/ibm/support.h | 2 | ||||
| -rw-r--r-- | libcxx/src/locale.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index aa8bc4482c5..874bcc156c2 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -454,7 +454,6 @@ namespace std { #define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #define _LIBCPP_HAS_NO_NULLPTR #define _LIBCPP_HAS_NO_UNICODE_CHARS -#define _LIBCPP_HAS_NO_STRONG_ENUMS #define _LIBCPP_HAS_IS_BASE_OF #if defined(_AIX) @@ -514,7 +513,7 @@ template <unsigned> struct __static_assert_check {}; #define __has_feature(__x) 0 #endif -#if __has_feature(cxx_explicit_conversions) +#if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__) # define _LIBCPP_EXPLICIT explicit #else # define _LIBCPP_EXPLICIT diff --git a/libcxx/include/support/ibm/support.h b/libcxx/include/support/ibm/support.h index 3effbaed160..0abfa7f95a6 100644 --- a/libcxx/include/support/ibm/support.h +++ b/libcxx/include/support/ibm/support.h @@ -15,7 +15,7 @@ extern "builtin" int __popcnt4(unsigned int); extern "builtin" int __popcnt8(unsigned long long); extern "builtin" unsigned int __cnttz4(unsigned int); extern "builtin" unsigned int __cnttz8(unsigned long long); -extern "builtin" unsigned int __cntlz4(unsigned long long); +extern "builtin" unsigned int __cntlz4(unsigned int); extern "builtin" unsigned int __cntlz8(unsigned long long); // Builtin functions for counting population diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index a326323ac1e..8e7fdb43189 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -1036,7 +1036,7 @@ ctype<char>::classic_table() _NOEXCEPT #elif defined(__EMSCRIPTEN__) return *__ctype_b_loc(); #elif defined(_AIX) - return (const unsigned long *)__lc_ctype_ptr->obj->mask; + return (const unsigned int *)__lc_ctype_ptr->obj->mask; #else // Platform not supported: abort so the person doing the port knows what to // fix |
