Patchwork [v3] Fix libstdc++/45281

login
register
mail settings
Submitter Paolo Carlini
Date Aug. 14, 2010, 12:10 a.m.
Message ID <4C65DEE9.3010107@oracle.com>
Download mbox | patch
Permalink /patch/61722/
State New
Headers show

Comments

Paolo Carlini - Aug. 14, 2010, 12:10 a.m.
Hi,

tested x86_64-linux, committed to mainline.

Paolo.

/////////////////////////
2010-08-13  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/45281
	* include/bits/stl_queue.h (queue(queue&&), operator=(queue&&),
	priority_queue(priority_queue&&), operator=(priority_queue&&)):
	Remove, per CH 15.

Patch

Index: include/bits/stl_queue.h
===================================================================
--- include/bits/stl_queue.h	(revision 163227)
+++ include/bits/stl_queue.h	(working copy)
@@ -1,6 +1,6 @@ 
 // Queue implementation -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -137,16 +137,6 @@ 
       explicit
       queue(_Sequence&& __c = _Sequence())
       : c(std::move(__c)) { }
-
-      queue(queue&& __q)
-      : c(std::move(__q.c)) { }
-
-      queue&
-      operator=(queue&& __q)
-      {
-	c = std::move(__q.c);
-	return *this;
-      }
 #endif
 
       /**
@@ -451,17 +441,6 @@ 
 	  c.insert(c.end(), __first, __last);
 	  std::make_heap(c.begin(), c.end(), comp);
 	}
-
-      priority_queue(priority_queue&& __pq)
-      : c(std::move(__pq.c)), comp(std::move(__pq.comp)) { }
-
-      priority_queue&
-      operator=(priority_queue&& __pq)
-      {
-	c = std::move(__pq.c);
-	comp = std::move(__pq.comp);
-	return *this;
-      }
 #endif
 
       /**