From patchwork Sat Aug 14 00:10:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 61722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 2225DB70B8 for ; Sat, 14 Aug 2010 10:10:33 +1000 (EST) Received: (qmail 31706 invoked by alias); 14 Aug 2010 00:10:29 -0000 Received: (qmail 31688 invoked by uid 22791); 14 Aug 2010 00:10:27 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from vsmtp12.tin.it (HELO vsmtp12.tin.it) (212.216.176.206) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 14 Aug 2010 00:10:21 +0000 Received: from [192.168.0.4] (79.43.213.160) by vsmtp12.tin.it (8.5.113) id 4BC85B970AD45588; Sat, 14 Aug 2010 02:10:18 +0200 Message-ID: <4C65DEE9.3010107@oracle.com> Date: Sat, 14 Aug 2010 02:10:17 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Fix libstdc++/45281 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, tested x86_64-linux, committed to mainline. Paolo. ///////////////////////// 2010-08-13 Paolo Carlini PR libstdc++/45281 * include/bits/stl_queue.h (queue(queue&&), operator=(queue&&), priority_queue(priority_queue&&), operator=(priority_queue&&)): Remove, per CH 15. 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 /**