git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

typeck2.c (friendly_abort): Delete definition. 

* typeck2.c (friendly_abort): Delete definition.
	* cp-tree.h (friendly_abort): Don't prototype.
	(my_friendly_assert): Use fancy_abort.

From-SVN: r49152
This commit is contained in:
Zack Weinberg 2002-01-23 19:41:15 +00:00
parent a63bea75b1
commit c588e52b27
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2002-01-23 Zack Weinberg <zack@codesourcery.com>
* typeck2.c (friendly_abort): Delete definition.
* cp-tree.h (friendly_abort): Don't prototype.
(my_friendly_assert): Use fancy_abort.
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org> 2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* cp-tree.h (my_friendly_abort): Remove. * cp-tree.h (my_friendly_abort): Remove.

5
gcc/cp/cp-tree.h
View File

@ -4349,12 +4349,9 @@ extern tree error_not_base_type PARAMS ((tree, tree));
extern tree binfo_or_else PARAMS ((tree, tree)); extern tree binfo_or_else PARAMS ((tree, tree));
extern void readonly_error PARAMS ((tree, const char *, int)); extern void readonly_error PARAMS ((tree, const char *, int));
extern int abstract_virtuals_error PARAMS ((tree, tree)); extern int abstract_virtuals_error PARAMS ((tree, tree));
extern void friendly_abort PARAMS ((int, const char *,
int, const char *))
ATTRIBUTE_NORETURN;
#define my_friendly_assert(EXP, N) (void) \ #define my_friendly_assert(EXP, N) (void) \
(((EXP) == 0) ? (friendly_abort (N, __FILE__, __LINE__, __FUNCTION__), 0) : 0) (((EXP) == 0) ? (fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0) : 0)
extern tree store_init_value PARAMS ((tree, tree)); extern tree store_init_value PARAMS ((tree, tree));
extern tree digest_init PARAMS ((tree, tree, tree *)); extern tree digest_init PARAMS ((tree, tree, tree *));

24
gcc/cp/typeck2.c
View File

@ -252,30 +252,6 @@ retry:
} }
} }
/* This is a wrapper around fancy_abort, as used in the back end and
other front ends. It will also report the magic number assigned to
this particular abort. That is for backward compatibility with the
old C++ abort handler, which would just report the magic number. */
void
friendly_abort (where, file, line, func)
int where;
const char *file;
int line;
const char *func;
{
if (errorcount > 0 || sorrycount > 0)
/* Say nothing. */;
else if (where > 0)
{
error ("internal error #%d", where);
/* Uncount this error, so internal_error will do the right thing. */
--errorcount;
}
fancy_abort (file, line, func);
}
/* Perform appropriate conversions on the initial value of a variable, /* Perform appropriate conversions on the initial value of a variable,
store it in the declaration DECL, store it in the declaration DECL,