diff --git a/libcxx/include/deque b/libcxx/include/deque --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -457,9 +457,6 @@ template */> class _LIBCPP_TEMPLATE_VIS deque { -private: - using __default_allocator_type = allocator<_Tp>; - public: // types: @@ -980,7 +977,7 @@ const void* __old_con_end, const void* __new_con_beg, const void* __new_con_end) const { - if (__beg && is_same::value) + if (__beg != nullptr && __asan_annotate_container_with_allocator<_Allocator>::value) __sanitizer_annotate_double_ended_contiguous_container( __beg, __end, __old_con_beg, __old_con_end, __new_con_beg, __new_con_end); }