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

exception.cc (__cplus_type_matcher): Match __eh_matcher prototype.

Browse source 
* exception.cc (__cplus_type_matcher): Match __eh_matcher
	prototype.

From-SVN: r28271
This commit is contained in:
Nathan Sidwell 1999-07-26 18:00:41 +00:00 • committed by Mark Mitchell
parent 1652ca3e7f
commit 8bc6495183
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
1999-07-26 Nathan Sidwell <nathan@acm.org>
* exception.cc (__cplus_type_matcher): Match __eh_matcher
prototype.
1999-07-26 Mark Mitchell <mark@codesourcery.com>
* cp-tree.h (CP_INTEGRAL_TYPE_P): New macro.

10
gcc/cp/exception.cc
View file

@ -1,5 +1,5 @@
// Functions for Exception Support for -*- C++ -*-
// Copyright (C) 1994, 95-97, 1998 Free Software Foundation
// Copyright (C) 1994, 95-97, 1998, 1999 Free Software Foundation
// This file is part of GNU CC.
@ -165,13 +165,11 @@ __eh_free (void *p)
free (p);
}
typedef void * (* rtimetype) (void);
extern "C" void *
__cplus_type_matcher (cp_eh_info *info, rtimetype match_info,
__cplus_type_matcher (__eh_info *info_, void *match_info,
exception_descriptor *exception_table)
{
cp_eh_info *info = (cp_eh_info *)info_;
void *ret;
/* No exception table implies the old style mechanism, so don't check. */
@ -184,7 +182,7 @@ __cplus_type_matcher (cp_eh_info *info, rtimetype match_info,
/* we don't worry about version info yet, there is only one version! */
void *match_type = match_info ();
void *match_type = ((void *(*)())match_info) ();
ret = __throw_type_match_rtti (match_type, info->type, info->original_value);
/* change value of exception */
if (ret)