From c2a31376715d4aa11845e12c16f5e4b8d75f26db Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 2 Jun 2015 21:40:58 +0000
Subject: [PATCH] Fix breakage that I introduced in r238848

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238870 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/scoped_allocator | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/scoped_allocator b/include/scoped_allocator
index 5864689d1..22e3a3084 100644
--- a/include/scoped_allocator
+++ b/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>