procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exception.cc (__terminate_func): Remove declaration.

Browse source 
2001-01-23  Chris Demetriou  <cgd@broadcom.com>

        * exception.cc (__terminate_func): Remove declaration.
        (__terminate_func_ptr): New typedef.
        (__terminate, __terminate_set_func): New extern function
        prototypes.
        (std::terminate): Use __terminate function.
        (std::set_terminate): Use __terminate_set_func function.

From-SVN: r39225
This commit is contained in:
Chris Demetriou 2001-01-24 03:04:04 +00:00 • committed by Chris Demetriou
parent 8a1894ac7b
commit 93982b798a
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libstdc++/ChangeLog
View file

@ -1,3 +1,12 @@
2001-01-23 Chris Demetriou <cgd@broadcom.com>
* exception.cc (__terminate_func): Remove declaration.
(__terminate_func_ptr): New typedef.
(__terminate, __terminate_set_func): New extern function
prototypes.
(std::terminate): Use __terminate function.
(std::set_terminate): Use __terminate_set_func function.
2000-11-24 Magnus Fromreide <magfr@lysator.liu.se>
* sstream: Backport libstdc++-V3 sstream to V2.

13
libstdc++/exception.cc
View file

@ -38,13 +38,17 @@
/* Define terminate, unexpected, set_terminate, set_unexpected as
well as the default terminate func and default unexpected func. */
extern std::terminate_handler __terminate_func __attribute__((__noreturn__));
/* __terminate and __terminate_set_func, defined in libgcc2. */
typedef void (*__terminate_func_ptr)(void) __attribute__ ((__noreturn__));
extern "C" void __terminate (void) __attribute__ ((__noreturn__));
extern "C" __terminate_func_ptr __terminate_set_func (__terminate_func_ptr);
using std::terminate;
void
std::terminate ()
{
__terminate_func ();
__terminate ();
}
void
@ -59,10 +63,7 @@ static std::unexpected_handler __unexpected_func __attribute__((__noreturn__))
std::terminate_handler
std::set_terminate (std::terminate_handler func)
{
std::terminate_handler old = __terminate_func;
__terminate_func = func;
return old;
return __terminate_set_func (func);
}
std::unexpected_handler