/cp

2007-08-10  Paolo Carlini  <pcarlini@suse.de>

	PR c++/22256
	* decl.c (check_special_function_return_type): Just error
	on return type specified for conversion operator.

/testsuite
2007-08-10  Paolo Carlini  <pcarlini@suse.de>

	PR c++/22256
	* g++.dg/conversion/op3.C: New.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e4fcf64..1260e10 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-10  Paolo Carlini  <pcarlini@suse.de>
+
+       PR c++/22256
+       * decl.c (check_special_function_return_type): Just error
+       on return type specified for conversion operator.
+
 2007-08-09  Daniel Berlin  <dberlin@dberlin.org>
 
        * typeck2.c (readonly_error): Handle general expressions.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 30ea44b..1740ed3 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6993,10 +6993,8 @@ check_special_function_return_type (special_function_kind sfk,
       break;
 
     case sfk_conversion:
-      if (type && !same_type_p (type, optype))
-       error ("operator %qT declared to return %qT", optype, type);
-      else if (type)
-       pedwarn ("return type specified for %<operator %T%>",  optype);
+      if (type)
+       error ("return type specified for %<operator %T%>",  optype);
       type = optype;
       break;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a293fa4..8046b94 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-10  Paolo Carlini  <pcarlini@suse.de>
+
+       PR c++/22256
+       * g++.dg/conversion/op3.C: New.
+
 2007-08-09  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/32987

diff --git a/gcc/testsuite/g++.dg/conversion/op3.C b/gcc/testsuite/g++.dg/conversion/op3.C
new file mode 100644 (file)
index 0000000..a01cdcf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/op3.C
@@ -0,0 +1,3 @@
+// PR c++/22256
+
+struct node { int* operator int*(); }; // { dg-error "return type specified" }