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.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@123080 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
04240d90ef
commit
52c4eb23e0
@ -92,6 +92,8 @@ typedef fpos<char_traits<wchar_t>::state_type> wstreampos;
|
|||||||
|
|
||||||
_LIBCPP_BEGIN_NAMESPACE_STD
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
||||||
|
|
||||||
|
class ios_base;
|
||||||
|
|
||||||
template<class _CharT> struct _LIBCPP_VISIBLE char_traits;
|
template<class _CharT> struct _LIBCPP_VISIBLE char_traits;
|
||||||
template<class _Tp> class _LIBCPP_VISIBLE allocator;
|
template<class _Tp> class _LIBCPP_VISIBLE allocator;
|
||||||
|
|
||||||
|
@ -165,10 +165,11 @@ struct _LIBCPP_VISIBLE integral_constant
|
|||||||
static constexpr _Tp value = __v;
|
static constexpr _Tp value = __v;
|
||||||
typedef _Tp value_type;
|
typedef _Tp value_type;
|
||||||
typedef integral_constant type;
|
typedef integral_constant type;
|
||||||
#ifndef _LIBCPP_HAS_NO_CONSTEXPR
|
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
constexpr operator value_type() {return value;}
|
#ifndef _LIBCPP_HAS_NO_CONSTEXPR
|
||||||
|
constexpr
|
||||||
#endif
|
#endif
|
||||||
|
operator value_type() const {return value;}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class _Tp, _Tp __v>
|
template <class _Tp, _Tp __v>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user