From 8bc6495183d4589a68cae00c343b7f1477baf624 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 26 Jul 1999 18:00:41 +0000 Subject: [PATCH] exception.cc (__cplus_type_matcher): Match __eh_matcher prototype. * exception.cc (__cplus_type_matcher): Match __eh_matcher prototype. From-SVN: r28271 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/exception.cc | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4dba90246fb..aac5417740a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1999-07-26 Nathan Sidwell + + * exception.cc (__cplus_type_matcher): Match __eh_matcher + prototype. + 1999-07-26 Mark Mitchell * cp-tree.h (CP_INTEGRAL_TYPE_P): New macro. diff --git a/gcc/cp/exception.cc b/gcc/cp/exception.cc index 8e8f35f50db..372536ed952 100644 --- a/gcc/cp/exception.cc +++ b/gcc/cp/exception.cc @@ -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) -- 2.30.2