Patchwork [v3] libstdc++/47668

login
register
mail settings
Submitter Paolo Carlini
Date Feb. 10, 2011, 12:10 a.m.
Message ID <4D532CE8.3050101@oracle.com>
Download mbox | patch
Permalink /patch/82549/
State New
Headers show

Comments

Paolo Carlini - Feb. 10, 2011, 12:10 a.m.
Hi,

tested x86_64-linux debug-mode and profile-mode, committed to mainline.

Paolo.

////////////////////
2011-02-09  Paolo Carlini  <paolo.carlini@oracle.com>

	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.

Patch

Index: include/debug/map.h
===================================================================
--- include/debug/map.h	(revision 169989)
+++ include/debug/map.h	(working copy)
@@ -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 @@ 
       typedef std::reverse_iterator<iterator>       reverse_iterator;
       typedef std::reverse_iterator<const_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())
Index: include/debug/multimap.h
===================================================================
--- include/debug/multimap.h	(revision 169989)
+++ include/debug/multimap.h	(working copy)
@@ -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 @@ 
       typedef std::reverse_iterator<iterator>        reverse_iterator;
       typedef std::reverse_iterator<const_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())
Index: include/profile/map.h
===================================================================
--- include/profile/map.h	(revision 169989)
+++ include/profile/map.h	(working copy)
@@ -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 @@ 
       typedef std::reverse_iterator<iterator>       reverse_iterator;
       typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-      using _Base::value_compare;
-
       // 23.3.1.1 construct/copy/destroy:
       explicit
       map(const _Compare& __comp = _Compare(),
Index: include/profile/multimap.h
===================================================================
--- include/profile/multimap.h	(revision 169989)
+++ include/profile/multimap.h	(working copy)
@@ -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 @@ 
       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())