From patchwork Tue Aug 30 15:36:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 112356 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 0FCD2B6F82 for ; Wed, 31 Aug 2011 01:36:33 +1000 (EST) Received: (qmail 21468 invoked by alias); 30 Aug 2011 15:36:30 -0000 Received: (qmail 21286 invoked by uid 22791); 30 Aug 2011 15:36:29 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 30 Aug 2011 15:36:15 +0000 Received: from rtcsinet22.oracle.com (rtcsinet22.oracle.com [66.248.204.30]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id p7UFaCSj018997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 30 Aug 2011 15:36:14 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by rtcsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p7UFaBYB018202 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 30 Aug 2011 15:36:12 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p7UFa6EV028205; Tue, 30 Aug 2011 10:36:06 -0500 Received: from [192.168.1.4] (/79.52.193.201) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Aug 2011 08:36:05 -0700 Message-ID: <4E5D0360.5070608@oracle.com> Date: Tue, 30 Aug 2011 17:36:00 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Implement DR 2061 (Ready in Bloomington) 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. Paolo. /////////////////////// 2011-08-30 Paolo Carlini * include/bits/stl_iterator.h (make_move_iterator): Implement DR2061. * testsuite/24_iterators/move_iterator/dr2061.cc: New. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-warning line numbers. Index: include/bits/stl_iterator.h =================================================================== --- include/bits/stl_iterator.h (revision 178320) +++ include/bits/stl_iterator.h (working copy) @@ -1,6 +1,7 @@ // Iterators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +// 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -1115,7 +1116,7 @@ template inline move_iterator<_Iterator> - make_move_iterator(const _Iterator& __i) + make_move_iterator(_Iterator __i) { return move_iterator<_Iterator>(__i); } template. + +#include + +// DR 2061 +void test01() +{ + int a[] = { 1, 2, 3, 4 }; + std::make_move_iterator(a + 4); + std::make_move_iterator(a); +} Index: testsuite/20_util/weak_ptr/comparison/cmp_neg.cc =================================================================== --- testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (revision 178320) +++ testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (working copy) @@ -52,8 +52,8 @@ // { dg-warning "note" "" { target *-*-* } 479 } // { dg-warning "note" "" { target *-*-* } 468 } // { dg-warning "note" "" { target *-*-* } 829 } -// { dg-warning "note" "" { target *-*-* } 1055 } -// { dg-warning "note" "" { target *-*-* } 1049 } -// { dg-warning "note" "" { target *-*-* } 341 } -// { dg-warning "note" "" { target *-*-* } 291 } +// { dg-warning "note" "" { target *-*-* } 1056 } +// { dg-warning "note" "" { target *-*-* } 1050 } +// { dg-warning "note" "" { target *-*-* } 342 } +// { dg-warning "note" "" { target *-*-* } 292 } // { dg-warning "note" "" { target *-*-* } 224 }