diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
commit | 00c2e03551a61ca76bdb303f1c007845f8a6dbd6 (patch) | |
tree | 51a3fb38eff156561441960606533fd0c1be71df /system/include/libcxx/bitset | |
parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
parent | 2787d1f7d01afb598ed56c4d52dab876e0a34a74 (diff) |
Merge pull request #1009 from waywardmonkeys/another-libcxx-update1.3.6
Another libcxx update
Diffstat (limited to 'system/include/libcxx/bitset')
-rw-r--r-- | system/include/libcxx/bitset | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/include/libcxx/bitset b/system/include/libcxx/bitset index 06fd729e..dd9be4fc 100644 --- a/system/include/libcxx/bitset +++ b/system/include/libcxx/bitset @@ -253,7 +253,7 @@ __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT : __first_{__v} #elif __SIZE_WIDTH__ == 32 : __first_{__v, __v >> __bits_per_word} -#elif +#else #error This constructor has not been ported to this platform #endif #endif @@ -632,11 +632,11 @@ __bitset<0, 0>::__bitset(unsigned long long) _NOEXCEPT { } -template <size_t _Size> class _LIBCPP_VISIBLE bitset; -template <size_t _Size> struct hash<bitset<_Size> >; +template <size_t _Size> class _LIBCPP_TYPE_VIS bitset; +template <size_t _Size> struct _LIBCPP_TYPE_VIS hash<bitset<_Size> >; template <size_t _Size> -class _LIBCPP_VISIBLE bitset +class _LIBCPP_TYPE_VIS bitset : private __bitset<_Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1, _Size> { public: @@ -1060,7 +1060,7 @@ operator^(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT } template <size_t _Size> -struct _LIBCPP_VISIBLE hash<bitset<_Size> > +struct _LIBCPP_TYPE_VIS hash<bitset<_Size> > : public unary_function<bitset<_Size>, size_t> { _LIBCPP_INLINE_VISIBILITY |