From patchwork Sat Apr 16 02:06:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] libstdc++/48631 X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 91467 Message-Id: <4DA8F9B3.1050506@oracle.com> To: "gcc-patches@gcc.gnu.org" Cc: libstdc++ Date: Sat, 16 Apr 2011 04:06:43 +0200 From: Paolo Carlini List-Id: Hi, tested x86_64-linux, committed mainline and 4_6-branch. Paolo. //////////////////////// 2011-04-15 Daniel Krugler Paolo Carlini PR libstdc++/48631 * include/bits/unique_ptr.h (default_delete<_Tp[]>): Add deleted function call operator. * testsuite/20_util/default_delete/48631_neg.cc: New. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-error line numbers. Index: include/bits/unique_ptr.h =================================================================== --- include/bits/unique_ptr.h (revision 172533) +++ include/bits/unique_ptr.h (working copy) @@ -79,6 +79,8 @@ "can't delete pointer to incomplete type"); delete [] __ptr; } + + template void operator()(_Up*) const = delete; }; /// 20.7.12.2 unique_ptr for single objects. Index: testsuite/20_util/default_delete/48631_neg.cc =================================================================== --- testsuite/20_util/default_delete/48631_neg.cc (revision 0) +++ testsuite/20_util/default_delete/48631_neg.cc (revision 0) @@ -0,0 +1,30 @@ +// { dg-options "-std=gnu++0x " } +// { dg-do compile } + +// Copyright (C) 2011 Free Software Foundation +// +// 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +struct B { }; +struct D : B { }; + +// libstdc++/48631 +D d; +std::default_delete db; +typedef decltype(db(&d)) type; // { dg-error "use of deleted function" } +// { dg-error "declared here" "" { target *-*-* } 83 } Index: testsuite/20_util/weak_ptr/comparison/cmp_neg.cc =================================================================== --- testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (revision 172533) +++ testsuite/20_util/weak_ptr/comparison/cmp_neg.cc (working copy) @@ -48,9 +48,9 @@ // { dg-warning "note" "" { target *-*-* } 1099 } // { dg-warning "note" "" { target *-*-* } 1094 } // { dg-warning "note" "" { target *-*-* } 1086 } -// { dg-warning "note" "" { target *-*-* } 483 } -// { dg-warning "note" "" { target *-*-* } 477 } -// { dg-warning "note" "" { target *-*-* } 467 } +// { dg-warning "note" "" { target *-*-* } 485 } +// { dg-warning "note" "" { target *-*-* } 479 } +// { dg-warning "note" "" { target *-*-* } 469 } // { dg-warning "note" "" { target *-*-* } 587 } // { dg-warning "note" "" { target *-*-* } 1056 } // { dg-warning "note" "" { target *-*-* } 1050 }