aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mmitchel@gcc.gnu.org>2000-01-23 19:51:01 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2000-01-23 19:51:01 +0000
commitba793d6e429767eb37d63e2fa94ccf42a36806bd (patch)
treecc088452431d16ed885deea0cbc33386395303cd
parentae373eda2fc639df6dc12ae1bb111f5a9f0f151f (diff)
downloadgcc-ba793d6e429767eb37d63e2fa94ccf42a36806bd.zip
gcc-ba793d6e429767eb37d63e2fa94ccf42a36806bd.tar.gz
gcc-ba793d6e429767eb37d63e2fa94ccf42a36806bd.tar.bz2
cp-tree.h (__eprintf): Remove declaration.
* 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. From-SVN: r31573
-rw-r--r--gcc/cp/ChangeLog11
-rw-r--r--gcc/cp/cp-tree.h22
-rw-r--r--gcc/cp/tree.c17
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 <mark@codesourcery.com>
+
+ * cp-tree.h (__eprintf): Remove declaration.
+ * tree.c (__eprintf): Remove definition.
+
+2000-01-23 Zack Weinberg <zack@rabi.columbia.edu>
+ Mark Mitchell <mark@codesourcery.com>
+
+ * cp-tree.h (CLASSTYPE_MARKED_N, SET_CLASSTYPE_MARKED_N,
+ CLEAR_CLASSTYPE_MARKED_N): Avoid signed vs. unsigned warnings.
+
2000-01-23 Brad Lucier <lucier@math.purdue.edu>
* 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. */