From 2ba34efc55ba605a18f858dc0d043ea90a07042a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 3 Mar 2010 11:06:59 +0000 Subject: [PATCH] unique_ptr.h (unique_ptr<>::get_deleter): Simplify return type. 2010-03-03 Paolo Carlini Jonathan Wakely * include/bits/unique_ptr.h (unique_ptr<>::get_deleter): Simplify return type. * testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Adjust dg-error line number. * testsuite/20_util/unique_ptr/assign/assign_neg.cc: Likewise. Co-Authored-By: Jonathan Wakely From-SVN: r157193 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/include/bits/unique_ptr.h | 12 ++++-------- .../20_util/unique_ptr/assign/assign_neg.cc | 4 ++-- .../20_util/unique_ptr/modifiers/reset_neg.cc | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3b3027043604..c70bcf9486a8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2010-03-03 Paolo Carlini + Jonathan Wakely + + * include/bits/unique_ptr.h (unique_ptr<>::get_deleter): Simplify + return type. + * testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Adjust + dg-error line number. + * testsuite/20_util/unique_ptr/assign/assign_neg.cc: Likewise. + 2010-03-02 Paolo Carlini * include/debug/bitset (hash): Minor tweaks. diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 974a5a2a027c..afa3043c428a 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -167,13 +167,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) get() const { return std::get<0>(_M_t); } - typename std::add_lvalue_reference::type + deleter_type& get_deleter() { return std::get<1>(_M_t); } - typename std::add_lvalue_reference< - typename std::add_const::type - >::type + const deleter_type& get_deleter() const { return std::get<1>(_M_t); } @@ -300,13 +298,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) get() const { return std::get<0>(_M_t); } - typename std::add_lvalue_reference::type + deleter_type& get_deleter() { return std::get<1>(_M_t); } - typename std::add_lvalue_reference< - typename std::add_const::type - >::type + const deleter_type& get_deleter() const { return std::get<1>(_M_t); } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc index 0916bf6f1396..4bf8e4b43490 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc @@ -49,7 +49,7 @@ test03() std::unique_ptr p2 = p1; } -// { dg-error "deleted function" "" { target *-*-* } 346 } +// { dg-error "deleted function" "" { target *-*-* } 342 } // { dg-error "used here" "" { target *-*-* } 42 } // { dg-error "no matching" "" { target *-*-* } 48 } // { dg-warning "candidates are" "" { target *-*-* } 115 } @@ -57,5 +57,5 @@ test03() // { dg-warning "note" "" { target *-*-* } 103 } // { dg-warning "note" "" { target *-*-* } 98 } // { dg-warning "note" "" { target *-*-* } 92 } -// { dg-error "deleted function" "" { target *-*-* } 209 } +// { dg-error "deleted function" "" { target *-*-* } 207 } // { dg-error "used here" "" { target *-*-* } 49 } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc index f292d655e861..3308fcbf81bc 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc @@ -36,4 +36,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 35 } -// { dg-error "deleted function" "" { target *-*-* } 336 } +// { dg-error "deleted function" "" { target *-*-* } 332 }