diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/unique_ptr.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc | 30 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc | 6 |
4 files changed, 45 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bed5426..d8a2d21 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,16 @@ 2011-04-15 Daniel Krugler <daniel.kruegler@googlemail.com> Paolo Carlini <paolo.carlini@oracle.com> + 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. + +2011-04-15 Daniel Krugler <daniel.kruegler@googlemail.com> + Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/48635 * include/bits/unique_ptr.h (unique_ptr<>::operator=(unique_ptr&&), unique_ptr<>::operator=(unique_ptr<>&&), diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 7df75ff..cf46d2a 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -79,6 +79,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION "can't delete pointer to incomplete type"); delete [] __ptr; } + + template<typename _Up> void operator()(_Up*) const = delete; }; /// 20.7.12.2 unique_ptr for single objects. diff --git a/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc b/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc new file mode 100644 index 0000000..9d779ac --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc @@ -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 +// <http://www.gnu.org/licenses/>. + +#include <memory> + +struct B { }; +struct D : B { }; + +// libstdc++/48631 +D d; +std::default_delete<B[]> db; +typedef decltype(db(&d)) type; // { dg-error "use of deleted function" } +// { dg-error "declared here" "" { target *-*-* } 83 } diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc index 5990cfd..f81e5af 100644 --- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc +++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc @@ -48,9 +48,9 @@ main() // { 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 } |