diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-01-08 20:00:48 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-01-08 20:00:48 +0000 |
| commit | b5b2a1e19a4ee8c49b73837e7247b403a74be8da (patch) | |
| tree | e3ed6280cb4cf0836baa248b376140b2f4ba90ab | |
| parent | 59c82f850d4e118caac1350a110ac1b2a7ee1932 (diff) | |
| download | llvm-b5b2a1e19a4ee8c49b73837e7247b403a74be8da.zip llvm-b5b2a1e19a4ee8c49b73837e7247b403a74be8da.tar.gz llvm-b5b2a1e19a4ee8c49b73837e7247b403a74be8da.tar.bz2 | |
Two minor fixes: 1. Put integral_constant conversion to integral in even without constexpr support. 2. Add ios_base to <iosfwd>. The latter is being tracked by LWG 2026.
llvm-svn: 123080
| -rw-r--r-- | libcxx/include/iosfwd | 2 | ||||
| -rw-r--r-- | libcxx/include/type_traits | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libcxx/include/iosfwd b/libcxx/include/iosfwd index 1f9fe3b..0e5c683 100644 --- a/libcxx/include/iosfwd +++ b/libcxx/include/iosfwd @@ -92,6 +92,8 @@ typedef fpos<char_traits<wchar_t>::state_type> wstreampos; _LIBCPP_BEGIN_NAMESPACE_STD +class ios_base; + template<class _CharT> struct _LIBCPP_VISIBLE char_traits; template<class _Tp> class _LIBCPP_VISIBLE allocator; diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 50e357c..4e6c200 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -165,10 +165,11 @@ struct _LIBCPP_VISIBLE integral_constant static constexpr _Tp value = __v; typedef _Tp value_type; typedef integral_constant type; -#ifndef _LIBCPP_HAS_NO_CONSTEXPR _LIBCPP_INLINE_VISIBILITY - constexpr operator value_type() {return value;} +#ifndef _LIBCPP_HAS_NO_CONSTEXPR + constexpr #endif + operator value_type() const {return value;} }; template <class _Tp, _Tp __v> |