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

include/deque

Index: include/deque
diff --git a/include/deque b/include/deque
index c6fbd512a1c6edc62f5851fd3bbe7d4f8b8a078e..452427ae164cc52f296eaed581b08a45a5fa2e51 100644
--- a/include/deque
+++ b/include/deque
@@ -167,7 +167,7 @@ template <class T, class Allocator>
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Tp, class _Allocator> class __deque_base;
-template <class _Tp, class _Allocator = allocator<_Tp> > class _LIBCPP_TYPE_VIS_ONLY deque;
+template <class _Tp, class _Allocator = counting_allocator<_Tp, allocation_group::deque> > class _LIBCPP_TYPE_VIS_ONLY deque;
 
 template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
           class _DiffType, _DiffType _BlockSize>
@@ -936,10 +936,10 @@ protected:
 
     static const difference_type __block_size;
 
-    typedef typename __rebind_alloc_helper<__alloc_traits, pointer>::type __pointer_allocator;
+    typedef typename __rebind_counting_alloc_helper<__alloc_traits, pointer, false>::type __pointer_allocator;
     typedef allocator_traits<__pointer_allocator>        __map_traits;
     typedef typename __map_traits::pointer               __map_pointer;
-    typedef typename __rebind_alloc_helper<__alloc_traits, const_pointer>::type __const_pointer_allocator;
+    typedef typename __rebind_counting_alloc_helper<__alloc_traits, const_pointer, false>::type __const_pointer_allocator;
     typedef typename allocator_traits<__const_pointer_allocator>::const_pointer __map_const_pointer;
     typedef __split_buffer<pointer, __pointer_allocator> __map;