From 88e6c94714fac98e4f077f57932d786930124d1c Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sat, 5 May 2007 00:39:45 +0000 Subject: [PATCH] cxxabi.h (__cxa_atexit): Conditionalize exception specification on #ifdef __cplusplus. * libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception specification on #ifdef __cplusplus. From-SVN: r124456 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libsupc++/cxxabi.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) 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 + + * libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception + specification on #ifdef __cplusplus. + 2007-05-04 Paolo Carlini * 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*); -- 2.30.2