diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2014-03-31 13:14:12 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2014-03-31 13:14:12 +0000 |
| commit | 750dc2785325a13222b39b5bd87c286736830392 (patch) | |
| tree | fbde03290e8f1165cdfc5d36d495bb0bfbdcf590 | |
| parent | c18ff8a4486629c2b6c2ca1b1794e791408d3de5 (diff) | |
| download | gcc-750dc2785325a13222b39b5bd87c286736830392.zip gcc-750dc2785325a13222b39b5bd87c286736830392.tar.gz gcc-750dc2785325a13222b39b5bd87c286736830392.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3026dc0..37a9a10 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 ec5940d..19f8fd2 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 3f7e2cf..708f748 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 } |