diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-03-03 11:06:59 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-03-03 11:06:59 +0000 |
| commit | 2ba34efc55ba605a18f858dc0d043ea90a07042a (patch) | |
| tree | 03ab7ad5938ab6cef4a19a8151e575666cb9f85b | |
| parent | bef7d288df865ca1b76d20b56f2883b1338ea285 (diff) | |
| download | gcc-2ba34efc55ba605a18f858dc0d043ea90a07042a.zip gcc-2ba34efc55ba605a18f858dc0d043ea90a07042a.tar.gz gcc-2ba34efc55ba605a18f858dc0d043ea90a07042a.tar.bz2 | |
unique_ptr.h (unique_ptr<>::get_deleter): Simplify return type.
2010-03-03 Paolo Carlini <paolo.carlini@oracle.com>
Jonathan Wakely <jwakely.gcc@gmail.com>
* 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 <jwakely.gcc@gmail.com>
From-SVN: r157193
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/unique_ptr.h | 12 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/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 3b30270..c70bcf9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2010-03-03 Paolo Carlini <paolo.carlini@oracle.com> + Jonathan Wakely <jwakely.gcc@gmail.com> + + * 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 <paolo.carlini@oracle.com> * 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 974a5a2..afa3043 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<deleter_type>::type + deleter_type& get_deleter() { return std::get<1>(_M_t); } - typename std::add_lvalue_reference< - typename std::add_const<deleter_type>::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<deleter_type>::type + deleter_type& get_deleter() { return std::get<1>(_M_t); } - typename std::add_lvalue_reference< - typename std::add_const<deleter_type>::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 0916bf6..4bf8e4b 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<int[2]> 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 f292d65..3308fcb 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 } |