re PR c++/13178 (Bogus C++ error message referring to operator 1)

	PR c++/13178
	* call.c (name_as_c_string): Print conversion operator names
	correctly.

	PR c++/13178
	* g++.dg/conversion/op1.C: New test.

From-SVN: r75986

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c2458abfe86d020353e1f218dc4463ae9db9b1a1..06733cc329dff00ae4ba6105653bf7529e1e28fa 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-16  Mark Mitchell  <mark@codesourcery.com>
 
+       PR c++/13178
+       * call.c (name_as_c_string): Print conversion operator names
+       correctly.
+
        PR c++/13478
        * call.c (initialize_reference): Pass -1 for inner parameter to
        convert_like_real.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index aaf902ceed63ff8422624f595b831cfe9dbdd703..7864d08820677d8f2d4055e4c1c0aa3687d4c969 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4986,6 +4986,15 @@ name_as_c_string (tree name, tree type, bool *free_p)
          *free_p = true;
        }
     }
+  else if (IDENTIFIER_TYPENAME_P (name))
+    {
+      pretty_name = concat ("operator ",
+                           type_as_string (TREE_TYPE (name),
+                                           TFF_PLAIN_IDENTIFIER),
+                           NULL);
+      /* Remember that we need to free the memory allocated.  */
+      *free_p = true;
+    }
   else
     pretty_name = (char *) IDENTIFIER_POINTER (name);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b5d83dcd90efcc66d299ba65f1d22650b90c8748..573156e27017786b8bc93864911c88165462462b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/13178
+       * g++.dg/conversion/op1.C: New test.
+
 2004-01-16  J"orn Rennecke <joern.rennecke@superh.com>
 
        PR 10392

diff --git a/gcc/testsuite/g++.dg/conversion/op1.C b/gcc/testsuite/g++.dg/conversion/op1.C
new file mode 100644 (file)
index 0000000..3aa21c7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/op1.C
@@ -0,0 +1,10 @@
+class C
+{
+  template<typename U> 
+  operator U();
+};
+
+int fn (C c) 
+{ 
+  return C::operator float(c); // { dg-error "operator U" }
+}