diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-31 13:14:12 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-31 13:14:12 +0000 |
| commit | 7dfb6ba63480996c01ba4eaab8d42b1aff2116c7 (patch) | |
| tree | fbde03290e8f1165cdfc5d36d495bb0bfbdcf590 /libstdc++-v3 | |
| parent | 95e1bae8655c5a027aabc86ee2de1ec163f2b913 (diff) | |
| download | ppe42-gcc-7dfb6ba63480996c01ba4eaab8d42b1aff2116c7.tar.gz ppe42-gcc-7dfb6ba63480996c01ba4eaab8d42b1aff2116c7.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208958 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 3026dc01cbe..37a9a102775 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 ec5940d6b21..19f8fd23f64 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 3f7e2cf379d..708f7486b47 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 } |
