[libcxx] r178026 - Simply debug mode tests per Dmitri Gribenko's suggestion.
Howard Hinnant
hhinnant at apple.com
Tue Mar 26 07:28:26 PDT 2013
Author: hhinnant
Date: Tue Mar 26 09:28:25 2013
New Revision: 178026
URL: http://llvm.org/viewvc/llvm-project?rev=178026&view=rev
Log:
Simply debug mode tests per Dmitri Gribenko's suggestion.
Modified:
libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_1.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp
libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
Modified: libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_back.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cback.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
const C c;
Modified: libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cfront.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
const C c;
Modified: libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_cindex.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
const C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_front.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_index.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_1.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_1.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c1;
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_2.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c1;
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_3.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c1;
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_4.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_5.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_6.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_7.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/db_iterators_8.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,7 +13,7 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
@@ -21,14 +21,8 @@
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
typedef int T;
typedef std::vector<T> C;
C c(1);
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <cstdlib>
#include <exception>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int>::const_iterator i = l1.end();
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <cstdlib>
#include <exception>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int> l2(a1, a1+3);
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int> l2(a1, a1+3);
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int> l2(a1, a1+3);
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int> l2(a1, a1+3);
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp Tue Mar 26 09:28:25 2013
@@ -13,21 +13,15 @@
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#include <vector>
#include <cassert>
#include <exception>
#include <cstdlib>
-void f1()
-{
- std::exit(0);
-}
-
int main()
{
- std::set_terminate(f1);
int a1[] = {1, 2, 3};
std::vector<int> l1(a1, a1+3);
std::vector<int>::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp?rev=178026&r1=178025&r2=178026&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp Tue Mar 26 09:28:25 2013
@@ -12,7 +12,7 @@
// void pop_back();
#if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#endif
#include <vector>
@@ -23,17 +23,10 @@
#include <cstdlib>
#include <exception>
-void f1()
-{
- std::exit(0);
-}
#endif
int main()
{
-#if _LIBCPP_DEBUG2 >= 1
- std::set_terminate(f1);
-#endif
{
std::vector<int> c;
c.push_back(1);
More information about the cfe-commits
mailing list