From patchwork Thu Jun 10 12:25:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 55207 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 C8FB3B7D1D for ; Thu, 10 Jun 2010 22:26:08 +1000 (EST) Received: (qmail 11309 invoked by alias); 10 Jun 2010 12:26:05 -0000 Received: (qmail 11280 invoked by uid 22791); 10 Jun 2010 12:26:03 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from vsmtp1.tin.it (HELO vsmtp1.tin.it) (212.216.176.141) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 Jun 2010 12:25:57 +0000 Received: from [192.168.0.4] (79.33.220.215) by vsmtp1.tin.it (8.0.022) id 4B9917F0095A3605; Thu, 10 Jun 2010 14:25:54 +0200 Message-ID: <4C10D9D2.3070008@oracle.com> Date: Thu, 10 Jun 2010 14:25:54 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100317 SUSE/3.0.4-1.1.1 Thunderbird/3.0.4 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Define tuple copy constructor explicitly-defaulted 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, noticed while fixing the last PR, tested x86_64-linux, committed. Paolo. ////////////////// 2010-06-10 Paolo Carlini * include/std/tuple (tuple(const tuple&)): Define explicitly-defaulted. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Tweak dg-warning line number. Index: include/std/tuple =================================================================== --- include/std/tuple (revision 160528) +++ include/std/tuple (working copy) @@ -238,8 +238,7 @@ tuple(_UElements&&... __elements) : _Inherited(std::forward<_UElements>(__elements)...) { } - tuple(const tuple& __in) - : _Inherited(static_cast(__in)) { } + tuple(const tuple&) = default; tuple(tuple&& __in) : _Inherited(static_cast<_Inherited&&>(__in)) { } @@ -321,8 +320,7 @@ tuple(_U1&& __a1, _U2&& __a2) : _Inherited(std::forward<_U1>(__a1), std::forward<_U2>(__a2)) { } - tuple(const tuple& __in) - : _Inherited(static_cast(__in)) { } + tuple(const tuple&) = default; tuple(tuple&& __in) : _Inherited(static_cast<_Inherited&&>(__in)) { } Index: testsuite/20_util/weak_ptr/comparison/cmp_neg.cc =================================================================== --- testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (revision 160528) +++ testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (working copy) @@ -44,7 +44,7 @@ // { dg-warning "note" "" { target *-*-* } 324 } // { dg-warning "note" "" { target *-*-* } 423 } // { dg-warning "note" "" { target *-*-* } 862 } -// { dg-warning "note" "" { target *-*-* } 512 } +// { dg-warning "note" "" { target *-*-* } 510 } // { dg-warning "note" "" { target *-*-* } 1005 } // { dg-warning "note" "" { target *-*-* } 340 } // { dg-warning "note" "" { target *-*-* } 290 }