From d72d690a921b82fe58e5dfdfd68dbdb70477d0de Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 5 Oct 2016 13:01:44 +0100 Subject: [PATCH] Remove invalid alias declaration from _Node_handle * include/bits/node_handle.h (_Node_handle): Remove invalid and unused alias declaration. From-SVN: r240779 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/bits/node_handle.h | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 20bbc5e13d6..1499faf8011 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-10-05 Jonathan Wakely + * include/bits/node_handle.h (_Node_handle): Remove invalid and unused + alias declaration. + PR libstdc++/70564 * include/experimental/functional (_Not_fn): Remove. (not_fn): Use std::_Not_fn. diff --git a/libstdc++-v3/include/bits/node_handle.h b/libstdc++-v3/include/bits/node_handle.h index 60c28838820..e89092bbee4 100644 --- a/libstdc++-v3/include/bits/node_handle.h +++ b/libstdc++-v3/include/bits/node_handle.h @@ -182,10 +182,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: using _AllocTraits = allocator_traits<_NodeAlloc>; - using _PtrTraits = pointer_traits; - _Node_handle(typename _AllocTraits::pointer __ptr, - const _NodeAlloc& __alloc) + const _NodeAlloc& __alloc) : _Node_handle_common<_Value, _NodeAlloc>(__ptr, __alloc) { if (__ptr) @@ -261,7 +259,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using _AllocTraits = allocator_traits<_NodeAlloc>; _Node_handle(typename _AllocTraits::pointer __ptr, - const _NodeAlloc& __alloc) + const _NodeAlloc& __alloc) : _Node_handle_common<_Value, _NodeAlloc>(__ptr, __alloc) { } const value_type& -- 2.30.2