[libcxx] r238870 - Fix breakage that I introduced in r238848

Marshall Clow mclow.lists at gmail.com
Tue Jun 2 14:40:58 PDT 2015


Author: marshall
Date: Tue Jun  2 16:40:58 2015
New Revision: 238870

URL: http://llvm.org/viewvc/llvm-project?rev=238870&view=rev
Log:
Fix breakage that I introduced in r238848

Modified:
    libcxx/trunk/include/scoped_allocator

Modified: libcxx/trunk/include/scoped_allocator
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/scoped_allocator?rev=238870&r1=238869&r2=238870&view=diff
==============================================================================
--- libcxx/trunk/include/scoped_allocator (original)
+++ libcxx/trunk/include/scoped_allocator Tue Jun  2 16:40:58 2015
@@ -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>





More information about the cfe-commits mailing list