diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 60978e8..5f1fb32 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-10-09 Jonathan Wakely <jwakely.gcc@gmail.com> + + * testsuite/20_util/shared_ptr/cons/58659.cc: Use VERIFY instead of + aborting. + 2013-10-09 Marcus Shawcroft <marcus.shawcroft@arm.com> * testsuite/20_util/shared_ptr/cons/58659.cc: Use __builtin_abort(). diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc index 1b823bc..9315796 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc @@ -47,8 +47,7 @@ namespace std void deallocate(value_type* p, size_t n) { - if (n != 1 || p != (void*)storage || !allocated) - __builtin_abort(); + VERIFY(n == 1 && p == (void*)storage && allocated); allocated = false; } |