summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/conversion/op3.C3
4 files changed, 16 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e4fcf64a2e0..1260e10a78a 100644
--- 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 30ea44b7d57..1740ed30b3b 100644
--- 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 a293fa4c83a..8046b944174 100644
--- 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
index 00000000000..a01cdcf7617
--- /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" }