aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl@gnu.org>2001-11-12 18:18:05 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2001-11-12 10:18:05 -0800
commitabfc1ef6079534411cab0dbfe6118c3971fb592c (patch)
tree9bf2e7fa802a8b35eceb9387e4415a687f6e3f45
parent692b7eb3e8b6da67b7bd629379b29e249aec6a14 (diff)
downloadgcc-abfc1ef6079534411cab0dbfe6118c3971fb592c.zip
gcc-abfc1ef6079534411cab0dbfe6118c3971fb592c.tar.gz
gcc-abfc1ef6079534411cab0dbfe6118c3971fb592c.tar.bz2
cvt.c (ocp_convert): Don't warn the address of a weak function is always `true'.
2001-11-12 H.J. Lu <hjl@gnu.org> * cp/cvt.c (ocp_convert): Don't warn the address of a weak function is always `true'. From-SVN: r46960
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/cvt.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 78588d7..f7b6296 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-12 H.J. Lu <hjl@gnu.org>
+
+ * cp/cvt.c (ocp_convert): Don't warn the address of a weak
+ function is always `true'.
+
2001-11-09 Neil Booth <neil@daikokuya.demon.co.uk>
* cp-lang.c (LANG_HOOKS_PRINT_DECL, LANG_HOOKS_PRINT_TYPE,
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index f8845b2..81d0577 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -814,7 +814,7 @@ ocp_convert (type, expr, convtype, flags)
else if (TREE_CODE (expr) == ADDR_EXPR
&& TREE_CODE (TREE_OPERAND (expr, 0)) == FUNCTION_DECL)
fn = TREE_OPERAND (expr, 0);
- if (fn)
+ if (fn && !DECL_WEAK (fn))
cp_warning ("the address of `%D', will always be `true'", fn);
return cp_truthvalue_conversion (e);
}