From: pzhao Date: Sun, 13 Jun 2010 03:06:39 +0000 (+0000) Subject: 2010-06-13 Shujing Zhao X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec89d23f85bb3056290ab497e9ab7f4ea26f47fe;p=thirdparty%2Fgcc.git 2010-06-13 Shujing Zhao * typeck.c (convert_for_assignment): Fix comment. Change message format from %d to %qP. (convert_for_initialization): Fix comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160671 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 75a76005b929..092cf7f8bbe4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-06-13 Shujing Zhao + + * typeck.c (convert_for_assignment): Fix comment. Change message + format from %d to %qP. + (convert_for_initialization): Fix comment. + 2010-06-11 Shujing Zhao * cp-tree.h (expr_list_kind): New type. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 75448d56f150..beef3881291f 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -7186,10 +7186,11 @@ delta_from_ptrmemfunc (tree t) } /* Convert value RHS to type TYPE as preparation for an assignment to - an lvalue of type TYPE. ERRTYPE is a string to use in error - messages: "assignment", "return", etc. If FNDECL is non-NULL, we - are doing the conversion in order to pass the PARMNUMth argument of - FNDECL. */ + an lvalue of type TYPE. ERRTYPE indicates what kind of error the + implicit conversion is. If FNDECL is non-NULL, we are doing the + conversion in order to pass the PARMNUMth argument of FNDECL. + If FNDECL is NULL, we are doing the conversion in function pointer + argument passing, conversion in initialization, etc. */ static tree convert_for_assignment (tree type, tree rhs, @@ -7331,7 +7332,7 @@ convert_for_assignment (tree type, tree rhs, case ICR_DEFAULT_ARGUMENT: if (fndecl) warning (OPT_Wmissing_format_attribute, - "parameter %d of %qD might be a candidate " + "parameter %qP of %qD might be a candidate " "for a format attribute", parmnum, fndecl); else warning (OPT_Wmissing_format_attribute, @@ -7386,7 +7387,7 @@ convert_for_assignment (tree type, tree rhs, /* Convert RHS to be of type TYPE. If EXP is nonzero, it is the target of the initialization. - ERRTYPE is a string to use in error messages. + ERRTYPE indicates what kind of error the implicit conversion is. Two major differences between the behavior of `convert_for_assignment' and `convert_for_initialization'