[counting-allocator] macOS buildtools/third_party/libc++/trunk/ changes.

include/list

Index: include/list
diff --git a/include/list b/include/list
index 28d505582c0d9d3465c2e62d37fcdd0c98c5827d..da8589f141d00bf113854bca61369952e4a80dfe 100644
--- a/include/list
+++ b/include/list
@@ -216,7 +216,7 @@ struct __list_node
     _Tp __value_;
 };
 
-template <class _Tp, class _Alloc = allocator<_Tp> > class _LIBCPP_TYPE_VIS_ONLY list;
+template <class _Tp, class _Alloc = counting_allocator<_Tp, allocation_group::list> > class _LIBCPP_TYPE_VIS_ONLY list;
 template <class _Tp, class _Alloc> class __list_imp;
 template <class _Tp, class _VoidPtr> class _LIBCPP_TYPE_VIS_ONLY __list_const_iterator;
 
@@ -485,7 +485,7 @@ protected:
     typedef __list_const_iterator<value_type, __void_pointer>       const_iterator;
     typedef __list_node_base<value_type, __void_pointer>            __node_base;
     typedef __list_node<value_type, __void_pointer>                 __node;
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node>::type __node_allocator;
+    typedef typename __rebind_counting_alloc_helper<__alloc_traits, __node>::type    __node_allocator;
     typedef allocator_traits<__node_allocator>                       __node_alloc_traits;
     typedef typename __node_alloc_traits::pointer                    __node_pointer;
     typedef typename __node_alloc_traits::pointer                    __node_const_pointer;
@@ -493,7 +493,7 @@ protected:
     typedef typename __alloc_traits::const_pointer                   const_pointer;
     typedef typename __alloc_traits::difference_type                 difference_type;
 
-    typedef typename __rebind_alloc_helper<__alloc_traits, __node_base>::type __node_base_allocator;
+    typedef typename __rebind_counting_alloc_helper<__alloc_traits, __node_base, false>::type __node_base_allocator;
     typedef typename allocator_traits<__node_base_allocator>::pointer __node_base_pointer;
 
     __node_base __end_;