aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-10-05 13:01:44 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2016-10-05 13:01:44 +0100
commitd72d690a921b82fe58e5dfdfd68dbdb70477d0de (patch)
treeb30ce9147350e8526073326d16d001fb7bf520a2
parent78ec9c15be7e34eb2b8c1faaea3e15b7740322df (diff)
downloadgcc-d72d690a921b82fe58e5dfdfd68dbdb70477d0de.zip
gcc-d72d690a921b82fe58e5dfdfd68dbdb70477d0de.tar.gz
gcc-d72d690a921b82fe58e5dfdfd68dbdb70477d0de.tar.bz2
Remove invalid alias declaration from _Node_handle
* include/bits/node_handle.h (_Node_handle): Remove invalid and unused alias declaration. From-SVN: r240779
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/bits/node_handle.h6
2 files changed, 5 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 20bbc5e..1499faf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2016-10-05 Jonathan Wakely <jwakely@redhat.com>
+ * 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 60c2883..e89092b 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<typename _NodeAlloc::pointer>;
-
_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&