From 36e7f0495db35743e385559ba510efd5aaa4dab4 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 10 Feb 2011 00:08:42 +0000 Subject: [PATCH] 2011-02-09 Paolo Carlini PR libstdc++/47668 * include/debug/map.h (map): Remove unnecessary using-declaration. * include/debug/multimap.h (multimap): Likewise. * include/profile/map.h (map): Likewise. * include/profile/multimap.h (multimap): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169990 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/debug/map.h | 4 +--- libstdc++-v3/include/debug/multimap.h | 4 +--- libstdc++-v3/include/profile/map.h | 4 +--- libstdc++-v3/include/profile/multimap.h | 4 +--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e45a71b..4ffa9cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2011-02-09 Paolo Carlini + + PR libstdc++/47668 + * include/debug/map.h (map): Remove unnecessary using-declaration. + * include/debug/multimap.h (multimap): Likewise. + * include/profile/map.h (map): Likewise. + * include/profile/multimap.h (multimap): Likewise. + 2011-02-09 Jonathan Wakely PR libstdc++/43863 diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h index c550db1..3108519 100644 --- a/libstdc++-v3/include/debug/map.h +++ b/libstdc++-v3/include/debug/map.h @@ -1,6 +1,6 @@ // Debugging map implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -73,8 +73,6 @@ namespace __debug typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit map(const _Compare& __comp = _Compare(), const _Allocator& __a = _Allocator()) diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h index a9d742b..3c22517 100644 --- a/libstdc++-v3/include/debug/multimap.h +++ b/libstdc++-v3/include/debug/multimap.h @@ -1,6 +1,6 @@ // Debugging multimap implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -74,8 +74,6 @@ namespace __debug typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit multimap(const _Compare& __comp = _Compare(), const _Allocator& __a = _Allocator()) diff --git a/libstdc++-v3/include/profile/map.h b/libstdc++-v3/include/profile/map.h index d66d2be..1edc16c 100644 --- a/libstdc++-v3/include/profile/map.h +++ b/libstdc++-v3/include/profile/map.h @@ -1,6 +1,6 @@ // Profiling map implementation -*- C++ -*- -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -68,8 +68,6 @@ namespace __profile typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit map(const _Compare& __comp = _Compare(), diff --git a/libstdc++-v3/include/profile/multimap.h b/libstdc++-v3/include/profile/multimap.h index e4c839f..76ce805 100644 --- a/libstdc++-v3/include/profile/multimap.h +++ b/libstdc++-v3/include/profile/multimap.h @@ -1,6 +1,6 @@ // Profiling multimap implementation -*- C++ -*- -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -63,8 +63,6 @@ namespace __profile typedef typename _Base::pointer pointer; typedef typename _Base::const_pointer const_pointer; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit multimap(const _Compare& __comp = _Compare(), const _Allocator& __a = _Allocator()) -- 2.7.4