From 42ff2c9d1a841dde56ad59c6f97b89ce7a74cbb5 Mon Sep 17 00:00:00 2001 From: mmitchel Date: Sun, 23 Jan 2000 19:51:01 +0000 Subject: [PATCH] * cp-tree.h (__eprintf): Remove declaration. * tree.c (__eprintf): Remove definition. * cp-tree.h (CLASSTYPE_MARKED_N, SET_CLASSTYPE_MARKED_N, CLEAR_CLASSTYPE_MARKED_N): Avoid signed vs. unsigned warnings. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31573 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 11 +++++++++++ gcc/cp/cp-tree.h | 22 ++++++++++------------ gcc/cp/tree.c | 17 ----------------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4d0044a..3295b63 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2000-01-23 Mark Mitchell + + * cp-tree.h (__eprintf): Remove declaration. + * tree.c (__eprintf): Remove definition. + +2000-01-23 Zack Weinberg + Mark Mitchell + + * cp-tree.h (CLASSTYPE_MARKED_N, SET_CLASSTYPE_MARKED_N, + CLEAR_CLASSTYPE_MARKED_N): Avoid signed vs. unsigned warnings. + 2000-01-23 Brad Lucier * class.c (dump_class_hierarchy): Print HOST_WIDE_INT properly. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a2e7aca..8884811 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1409,21 +1409,21 @@ struct lang_type /* Mark bits for depth-first and breath-first searches. */ /* Get the value of the Nth mark bit. */ -#define CLASSTYPE_MARKED_N(NODE, N) \ +#define CLASSTYPE_MARKED_N(NODE, N) \ (((CLASS_TYPE_P (NODE) ? TYPE_LANG_SPECIFIC (NODE)->marks \ - : TYPE_ALIAS_SET (NODE)) & (1 << N)) != 0) + : ((unsigned) TYPE_ALIAS_SET (NODE))) & (1 << N)) != 0) /* Set the Nth mark bit. */ -#define SET_CLASSTYPE_MARKED_N(NODE, N) \ - (CLASS_TYPE_P (NODE) \ - ? (TYPE_LANG_SPECIFIC (NODE)->marks |= (1 << (N))) \ - : (TYPE_ALIAS_SET (NODE) |= (1 << (N)))) +#define SET_CLASSTYPE_MARKED_N(NODE, N) \ + (CLASS_TYPE_P (NODE) \ + ? (void) (TYPE_LANG_SPECIFIC (NODE)->marks |= (1 << (N))) \ + : (void) (TYPE_ALIAS_SET (NODE) |= (1 << (N)))) /* Clear the Nth mark bit. */ -#define CLEAR_CLASSTYPE_MARKED_N(NODE, N) \ - (CLASS_TYPE_P (NODE) \ - ? (TYPE_LANG_SPECIFIC (NODE)->marks &= ~(1 << (N))) \ - : (TYPE_ALIAS_SET (NODE) &= ~(1 << (N)))) +#define CLEAR_CLASSTYPE_MARKED_N(NODE, N) \ + (CLASS_TYPE_P (NODE) \ + ? (void) (TYPE_LANG_SPECIFIC (NODE)->marks &= ~(1 << (N))) \ + : (void) (TYPE_ALIAS_SET (NODE) &= ~(1 << (N)))) /* Get the value of the mark bits. */ #define CLASSTYPE_MARKED(NODE) CLASSTYPE_MARKED_N(NODE, 0) @@ -4164,8 +4164,6 @@ extern const char *lang_printable_name PROTO((tree, int)); extern tree build_exception_variant PROTO((tree, tree)); extern tree copy_template_template_parm PROTO((tree)); extern void print_lang_statistics PROTO((void)); -extern void __eprintf - PROTO((const char *, const char *, unsigned, const char *)); extern tree array_type_nelts_total PROTO((tree)); extern tree array_type_nelts_top PROTO((tree)); extern tree break_out_target_exprs PROTO((tree)); diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 432ec29..4a47ba8 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1482,23 +1482,6 @@ print_lang_statistics () #endif } -/* This is used by the `assert' macro. It is provided in libgcc.a, - which `cc' doesn't know how to link. Note that the C++ front-end - no longer actually uses the `assert' macro (instead, it calls - my_friendly_assert). But all of the back-end files still need this. */ - -void -__eprintf (string, expression, line, filename) - const char *string; - const char *expression; - unsigned line; - const char *filename; -{ - fprintf (stderr, string, expression, line, filename); - fflush (stderr); - abort (); -} - /* Return, as an INTEGER_CST node, the number of elements for TYPE (which is an ARRAY_TYPE). This counts only elements of the top array. */ -- 2.7.4