diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-05 00:39:45 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-05 00:39:45 +0000 |
| commit | fa7f86220b6893e422bc64006e5e60bd23c3364b (patch) | |
| tree | e4454e9c06fcb8ee92f13cc95920ee78a91d5cd7 | |
| parent | fbaa1d93128f1d1e8cfdbcdc24bf8aad8d00932f (diff) | |
| download | ppe42-gcc-fa7f86220b6893e422bc64006e5e60bd23c3364b.tar.gz ppe42-gcc-fa7f86220b6893e422bc64006e5e60bd23c3364b.zip | |
* libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception
specification on #ifdef __cplusplus.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124456 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/cxxabi.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 70d304c7aca..c2641634d08 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-05-04 Mark Mitchell <mark@codesourcery.com> + + * libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception + specification on #ifdef __cplusplus. + 2007-05-04 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_memory.h: Rename to stl_auto_ptr.h. @@ -20,6 +25,7 @@ * libsupc++/atexit_arm.cc: New file. * libsupc++/vec.cc (__aeabi_atexit): Remove. * libsupc++/cxxabi.h (__cxa_atexit): Add exception specification. + * libsupc++/Makefile.am: Add atexit_arm.cc. * libsupc++/Makefile.in: Regenerated. diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index fb082d32ac2..9e8a9107b79 100644 --- a/libstdc++-v3/libsupc++/cxxabi.h +++ b/libstdc++-v3/libsupc++/cxxabi.h @@ -136,7 +136,11 @@ namespace __cxxabiv1 // DSO destruction. int - __cxa_atexit(void (*)(void*), void*, void*) throw (); + __cxa_atexit(void (*)(void*), void*, void*) +#ifdef __cplusplus + throw () +#endif + ; int __cxa_finalize(void*); |
