From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Mon, 31 Mar 2014 13:14:12 +0000 (+0000)
Subject: Fix 18_support/exception_ptr/60612-*.cc on non-C99 targets
X-Git-Tag: basepoints/gcc-5~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=750dc2785325a13222b39b5bd87c286736830392;p=thirdparty%2Fgcc.git

Fix 18_support/exception_ptr/60612-*.cc on non-C99 targets

	* testsuite/18_support/exception_ptr/60612-terminate.cc
	(terminate, f): Wrap in _GLIBCXX_USE_C99.
	* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.

From-SVN: r208958
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3026dc01cbef..37a9a1027751 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* testsuite/18_support/exception_ptr/60612-terminate.cc
+	(terminate, f): Wrap in _GLIBCXX_USE_C99.
+	* testsuite/18_support/exception_ptr/60612-unexpected.cc: Likewise.
+
 2014-03-27  Jonathan Wakely  <jwakely@redhat.com>
 
 	* doc/xml/manual/io.xml (std.io.objects): Additional markup.
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
index ec5940d6b217..19f8fd23f641 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
@@ -23,6 +23,7 @@
 #include <exception>
 #include <stdlib.h>
 
+#ifdef _GLIBCXX_USE_C99
 void terminate() { _Exit(0); }
 
 void f() noexcept
@@ -34,8 +35,12 @@ void f() noexcept
     std::rethrow_exception(std::current_exception());
   }
 }
+#endif
 
 int main()
 {
+#ifdef _GLIBCXX_USE_C99
   f();
+#endif
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
index 3f7e2cf379de..708f7486b47b 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
@@ -23,6 +23,7 @@
 #include <exception>
 #include <stdlib.h>
 
+#ifdef _GLIBCXX_USE_C99
 void unexpected() { _Exit(0); }
 
 void f() throw()
@@ -34,8 +35,11 @@ void f() throw()
     std::rethrow_exception(std::current_exception());
   }
 }
+#endif
 
 int main()
 {
+#ifdef _GLIBCXX_USE_C99
   f();
+#endif
 }