From patchwork Tue Apr 12 09:07:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 90749 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 2D2F51007D1 for ; Tue, 12 Apr 2011 19:07:28 +1000 (EST) Received: (qmail 15385 invoked by alias); 12 Apr 2011 09:07:21 -0000 Received: (qmail 15363 invoked by uid 22791); 12 Apr 2011 09:07:19 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from smtp205.alice.it (HELO smtp205.alice.it) (82.57.200.101) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 12 Apr 2011 09:07:14 +0000 Received: from [192.168.1.4] (79.33.220.194) by smtp205.alice.it (8.5.124.08) id 4D0D003809DB3989; Tue, 12 Apr 2011 11:07:11 +0200 Message-ID: <4DA4163C.7050508@oracle.com> Date: Tue, 12 Apr 2011 11:07:08 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] libstdc++/48566 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 mainline and 4_6-branch. Paolo. /////////////////// 2011-04-12 Allan McRae PR libstdc++/48566 * testsuite/tr1/6_containers/unordered_map/requirements/ iterator_null_neg.cc: Include . * testsuite/tr1/6_containers/unordered_set/requirements/ iterator_null_neg.cc: Likewise. * testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Include . * testsuite/util/testsuite_common_types.h: Include . * testsuite/29_atomics/atomic_integral/cons/assign_neg.cc: Adjust dg-error line numbers. * testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/increment_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc: Likewise. * testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc: Likewise. * testsuite/29_atomics/atomic/cons/assign_neg.cc: Likewise. * testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise. Index: testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc =================================================================== --- testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc (revision 172300) +++ testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc (working copy) @@ -1,6 +1,6 @@ // { dg-require-fileio "" } -// Copyright (C) 2010 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -21,6 +21,7 @@ #include #include +#include #include void test01() Index: testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc =================================================================== --- testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc (revision 172300) +++ testsuite/tr1/6_containers/unordered_set/requirements/iterator_null_neg.cc (working copy) @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2009, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::tr1::unordered_set::iterator it4 = NULL; // { dg-error "conversion" } std::tr1::unordered_set::const_iterator cit4 = NULL; // { dg-error "conversion" } Index: testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc =================================================================== --- testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc (revision 172300) +++ testsuite/tr1/6_containers/unordered_map/requirements/iterator_null_neg.cc (working copy) @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2009, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::tr1::unordered_map::iterator it1 = NULL; // { dg-error "conversion" } std::tr1::unordered_map::const_iterator cit1 = NULL; // { dg-error "conversion" } Index: testsuite/29_atomics/atomic_integral/cons/assign_neg.cc =================================================================== --- testsuite/29_atomics/atomic_integral/cons/assign_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic_integral/cons/assign_neg.cc (working copy) @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 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 @@ -29,5 +29,5 @@ return 0; } -// { dg-error "deleted" "" { target *-*-* } 571 } +// { dg-error "deleted" "" { target *-*-* } 572 } // { dg-prune-output "include" } Index: testsuite/29_atomics/atomic_integral/cons/copy_neg.cc =================================================================== --- testsuite/29_atomics/atomic_integral/cons/copy_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic_integral/cons/copy_neg.cc (working copy) @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 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 @@ -29,5 +29,5 @@ return 0; } -// { dg-error "deleted" "" { target *-*-* } 610 } +// { dg-error "deleted" "" { target *-*-* } 611 } // { dg-prune-output "include" } Index: testsuite/29_atomics/atomic_integral/operators/increment_neg.cc =================================================================== --- testsuite/29_atomics/atomic_integral/operators/increment_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic_integral/operators/increment_neg.cc (working copy) @@ -2,7 +2,7 @@ // { dg-do compile } // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -28,6 +28,6 @@ return 0; } -// { dg-error "operator" "" { target *-*-* } 362 } // { dg-error "operator" "" { target *-*-* } 363 } // { dg-error "operator" "" { target *-*-* } 364 } +// { dg-error "operator" "" { target *-*-* } 365 } Index: testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc =================================================================== --- testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic_integral/operators/bitwise_neg.cc (working copy) @@ -2,7 +2,7 @@ // { dg-do compile } // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -27,7 +27,7 @@ return 0; } -// { dg-error "operator" "" { target *-*-* } 427 } // { dg-error "operator" "" { target *-*-* } 428 } // { dg-error "operator" "" { target *-*-* } 429 } +// { dg-error "operator" "" { target *-*-* } 430 } // { dg-excess-errors "In file included from" } Index: testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc =================================================================== --- testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic_integral/operators/decrement_neg.cc (working copy) @@ -2,7 +2,7 @@ // { dg-do compile } // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -28,6 +28,6 @@ return 0; } -// { dg-error "operator" "" { target *-*-* } 384 } // { dg-error "operator" "" { target *-*-* } 385 } // { dg-error "operator" "" { target *-*-* } 386 } +// { dg-error "operator" "" { target *-*-* } 387 } Index: testsuite/29_atomics/atomic/cons/assign_neg.cc =================================================================== --- testsuite/29_atomics/atomic/cons/assign_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic/cons/assign_neg.cc (working copy) @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 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 @@ -28,5 +28,5 @@ return 0; } -// { dg-error "deleted" "" { target *-*-* } 571 } +// { dg-error "deleted" "" { target *-*-* } 572 } // { dg-prune-output "include" } Index: testsuite/29_atomics/atomic/cons/copy_neg.cc =================================================================== --- testsuite/29_atomics/atomic/cons/copy_neg.cc (revision 172300) +++ testsuite/29_atomics/atomic/cons/copy_neg.cc (working copy) @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 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 @@ -28,5 +28,5 @@ return 0; } -// { dg-error "deleted" "" { target *-*-* } 610 } +// { dg-error "deleted" "" { target *-*-* } 611 } // { dg-prune-output "include" } Index: testsuite/util/testsuite_common_types.h =================================================================== --- testsuite/util/testsuite_common_types.h (revision 172300) +++ testsuite/util/testsuite_common_types.h (working copy) @@ -1,7 +1,7 @@ // -*- C++ -*- // typelist for the C++ library testsuite. // -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 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 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include