diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2013-10-09 18:37:26 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2013-10-09 19:37:26 +0100 |
| commit | fd673f296a9070dd0085108dca9bbd7ad8dd4e1c (patch) | |
| tree | 33ba8b627ead625ca9501c9e386ed40fc8711594 | |
| parent | 2431114fa04e941fadd56eeaace1006398d40082 (diff) | |
| download | gcc-fd673f296a9070dd0085108dca9bbd7ad8dd4e1c.zip gcc-fd673f296a9070dd0085108dca9bbd7ad8dd4e1c.tar.gz gcc-fd673f296a9070dd0085108dca9bbd7ad8dd4e1c.tar.bz2 | |
58659.cc: Use VERIFY instead of aborting.
* testsuite/20_util/shared_ptr/cons/58659.cc: Use VERIFY instead of
aborting.
From-SVN: r203325
| -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; } |