re PR c++/21987 (New testsuite failure g++.dg/warn/conversion-function-1.C)

	PR c++/21987
	* decl.c (grok_op_properties): Add missing warn_conversion check.

From-SVN: r100940

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 46941cab29e04823c5db92d041373434a463a694..caaefb9fd0db7d14c51afef034ed34b504cdd2ff 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-14  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/21987
+       * decl.c (grok_op_properties): Add missing warn_conversion check.
+
 2005-06-13  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/20789

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 12622cedfb7ff0a3eb079a752bc8ff71c0f42d8d..3f62ad5540d04134f17652a37276bb7cde8dd9c7 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9143,6 +9143,7 @@ grok_op_properties (tree decl, bool complain)
       /* Warn about conversion operators that will never be used.  */
       if (IDENTIFIER_TYPENAME_P (name) 
          && ! DECL_TEMPLATE_INFO (decl)
+         && warn_conversion
          /* Warn only declaring the function; there is no need to
             warn again about out-of-class definitions.  */
          && class_type == current_class_type)