LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around GCC 4.9 bug regarding default initialization of const variables

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@300510 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-04-17 22:32:02 +00:00
parent 7e698523da
commit 55dc5daa60
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/memory
View File

@@ -2079,17 +2079,12 @@ struct __compressed_pair_elem {
typedef const _Tp& const_reference; typedef const _Tp& const_reference;
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
template <bool _Dummy = true, class = typename enable_if< constexpr __compressed_pair_elem() : __value_() {}
__dependent_type<is_default_constructible<_Tp>, _Dummy>::value
>::type
>
_LIBCPP_CONSTEXPR __compressed_pair_elem()
_NOEXCEPT_(is_nothrow_default_constructible<_Tp>::value)
: __value_() {}
template <class _Up, class = typename enable_if< template <class _Up, class = typename enable_if<
!is_same<__compressed_pair_elem, _Up>::value>::type> !is_same<__compressed_pair_elem, typename decay<_Up>::type>::value
_LIBCPP_CONSTEXPR explicit >::type>
constexpr explicit
__compressed_pair_elem(_Up&& __u) __compressed_pair_elem(_Up&& __u)
: __value_(_VSTD::forward<_Up>(__u)){}; : __value_(_VSTD::forward<_Up>(__u)){};
@@ -2118,11 +2113,12 @@ struct __compressed_pair_elem<_Tp, _Idx, true> : private _Tp {
typedef _Tp __value_type; typedef _Tp __value_type;
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
_LIBCPP_CONSTEXPR __compressed_pair_elem() = default; constexpr __compressed_pair_elem() = default;
template <class _Up, class = typename enable_if< template <class _Up, class = typename enable_if<
!is_same<__compressed_pair_elem, _Up>::value>::type> !is_same<__compressed_pair_elem, typename decay<_Up>::type>::value
_LIBCPP_CONSTEXPR explicit >::type>
constexpr explicit
__compressed_pair_elem(_Up&& __u) __compressed_pair_elem(_Up&& __u)
: __value_type(_VSTD::forward<_Up>(__u)){}; : __value_type(_VSTD::forward<_Up>(__u)){};
@@ -2161,8 +2157,14 @@ class __compressed_pair : private __compressed_pair_elem<_T1, 0>,
public: public:
#ifndef _LIBCPP_CXX03_LANG #ifndef _LIBCPP_CXX03_LANG
template <bool _Dummy = true,
class = typename enable_if<
__dependent_type<is_default_constructible<_T1>, _Dummy>::value &&
__dependent_type<is_default_constructible<_T2>, _Dummy>::value
>::type
>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__compressed_pair() = default; constexpr __compressed_pair() {}
template <class _Tp, typename enable_if<!is_same<typename decay<_Tp>::type, template <class _Tp, typename enable_if<!is_same<typename decay<_Tp>::type,
__compressed_pair>::value, __compressed_pair>::value,