From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Wed, 9 Oct 2013 18:37:26 +0000 (+0000)
Subject: 58659.cc: Use VERIFY instead of aborting.
X-Git-Tag: releases/gcc-4.9.0~3653
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd673f296a9070dd0085108dca9bbd7ad8dd4e1c;p=thirdparty%2Fgcc.git

58659.cc: Use VERIFY instead of aborting.

	* testsuite/20_util/shared_ptr/cons/58659.cc: Use VERIFY instead of
	aborting.

From-SVN: r203325
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60978e8a17df..5f1fb321ae81 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 1b823bc50e2a..9315796b2402 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;
       }