diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-06-02 21:40:58 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-06-02 21:40:58 +0000 |
| commit | 8880c208921ff7967e510a8641d845126065b36e (patch) | |
| tree | 9cab3cb427d70eb1af9a66d25b04d958e1a00b37 | |
| parent | 315b88d0cfe21a71df07123f49ec881cb731673a (diff) | |
| download | bcm5719-llvm-8880c208921ff7967e510a8641d845126065b36e.tar.gz bcm5719-llvm-8880c208921ff7967e510a8641d845126065b36e.zip | |
Fix breakage that I introduced in r238848
llvm-svn: 238870
| -rw-r--r-- | libcxx/include/scoped_allocator | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator index 5864689d1f2..22e3a30847e 100644 --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -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> |
