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'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46960 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 78588d7..f7b6296 100644 (file)
--- 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 (file)
--- 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);
        }