diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-18 20:18:55 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-18 20:18:55 +0000 |
| commit | dad9e66fe0ead81c1caeb9213842b3217ef7ff2d (patch) | |
| tree | d9760becd472f3a39b3bb47bb7a52a89d8170354 /libstdc++-v3/testsuite | |
| parent | da05eea017026527863027161138a6a8a94c5e91 (diff) | |
| download | gcc-dad9e66fe0ead81c1caeb9213842b3217ef7ff2d.tar.gz | |
* include/bits/unique_ptr.h (make_unique): Declare inline.
(unique_ptr<T[],D>::reset()): Combine two overloads into one.
(default_delete, unique_ptr): Add doxygen comments.
* include/bits/shared_ptr_base.h: Improve doxygen comments.
* include/bits/shared_ptr.h: Likewise.
* testsuite/20_util/default_delete/48631_neg.cc: Adjust dg-error line
number.
* testsuite/20_util/unique_ptr/assign/48635_neg.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199069 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc b/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc index ffcb611ca76..d0619fd9ca0 100644 --- a/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc +++ b/libstdc++-v3/testsuite/20_util/default_delete/48631_neg.cc @@ -27,4 +27,4 @@ struct D : B { }; D d; std::default_delete<B[]> db; typedef decltype(db(&d)) type; // { dg-error "use of deleted function" } -// { dg-error "declared here" "" { target *-*-* } 104 } +// { dg-error "declared here" "" { target *-*-* } 122 } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc index a0f0ed95e75..c78564270f4 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc @@ -41,10 +41,10 @@ void f() std::unique_ptr<int, B&> ub(nullptr, b); std::unique_ptr<int, D&> ud(nullptr, d); ub = std::move(ud); -// { dg-error "use of deleted function" "" { target *-*-* } 206 } +// { dg-error "use of deleted function" "" { target *-*-* } 270 } std::unique_ptr<int[], B&> uba(nullptr, b); std::unique_ptr<int[], D&> uda(nullptr, d); uba = std::move(uda); -// { dg-error "use of deleted function" "" { target *-*-* } 396 } +// { dg-error "use of deleted function" "" { target *-*-* } 515 } } |