generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix breakage that I introduced in r238848

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238870 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2015-06-02 21:40:58 +00:00
parent f0324bcaa1
commit c2a3137671
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/scoped_allocator
View File

@ -171,12 +171,20 @@ struct __get_poc_swap<_A0, _Allocs...>
__get_poc_swap<_Allocs...>::value;
};
template <class ..._Allocs> struct __get_is_always_equal;
template <class _A0>
struct __get_is_always_equal<_A0>
{
static const bool value = allocator_traits<_A0>::is_always_equal::value;
};
template <class _A0, class ..._Allocs>
struct __get_poc_always_equal<_A0, _Allocs...>
struct __get_is_always_equal<_A0, _Allocs...>
{
static const bool value =
allocator_traits<_A0>::is_always_equal::value ||
__get_poc_always_equal<_Allocs...>::value;
__get_is_always_equal<_Allocs...>::value;
};
template <class ..._Allocs>
@ -409,7 +417,7 @@ public:
typedef integral_constant
<
bool,
__get_poc_always_equal<outer_allocator_type, _InnerAllocs...>::value
__get_is_always_equal<outer_allocator_type, _InnerAllocs...>::value
> is_always_equal;
template <class _Tp>