aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-typeck.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 982504b..01d5249 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-11 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * c-typeck.c (convert_for_assignment): Avoid checking
+ OPT_Wc___compat, as it is always true.
+
2005-06-11 David Edelsohn <edelsohn@gnu.org>
* config/rs6000/rs6000.md (eq<mode>_compare): Restrict to Pmode.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 918afa0..fe56cf4 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3787,8 +3787,7 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
int *p = NULL;
where NULL is typically defined in C to be '(void *) 0'. */
- if (OPT_Wc___compat && VOID_TYPE_P (ttr) && rhs != null_pointer_node
- && !VOID_TYPE_P (ttl))
+ if (VOID_TYPE_P (ttr) && rhs != null_pointer_node && !VOID_TYPE_P (ttl))
warning (OPT_Wc___compat, "request for implicit conversion from "
"%qT to %qT not permitted in C++", rhstype, type);