re PR c++/21369 (Template function definition rejected if function return type begins...

	PR c++/21369
	* parser.c (cp_parser_elaborated_type_specifier): Don't treat
	class types as templates if the type is not appearing as part of a
	type definition or declaration.
	PR c++/21369
	* g++.dg/parse/ret-type3.C: New test.

From-SVN: r105241

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9fa7f0db3ca278f4ff9f3ef1c5970ac3b2728454..7842a019fe7576440f0da494dcdfc8e8d200298a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/21369
+       * parser.c (cp_parser_elaborated_type_specifier): Don't treat
+       class types as templates if the type is not appearing as part of a
+       type definition or declaration.
+
 2005-10-10  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/24277

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e5a03fcfe436a0f497e137691096de7e95fbbc93..6d7d3c8cac6cd6a4a05e0c9138baacb8bfaf8869 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10066,6 +10066,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
             declaration context.  */
 
          tag_scope ts;
+         bool template_p;
+
          if (is_friend)
            /* Friends have special name lookup rules.  */
            ts = ts_within_enclosing_non_class;
@@ -10082,8 +10084,11 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
            warning (OPT_Wattributes,
                     "type attributes are honored only at type definition");
 
-         type = xref_tag (tag_type, identifier, ts,
-                          parser->num_template_parameter_lists);
+         template_p = 
+           (parser->num_template_parameter_lists
+            && (cp_parser_next_token_starts_class_definition_p (parser)
+                || cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON)));
+         type = xref_tag (tag_type, identifier, ts, template_p);
        }
     }
   if (tag_type != enum_type)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96a21e9d9862b542e49f8b786eebb7e8ffcc4f88..949c1da07ea5609269db6682bdf4765ff5f192a7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/21369
+       * g++.dg/parse/ret-type3.C: New test.
+
 2005-10-11  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR tree-opt/23946

diff --git a/gcc/testsuite/g++.dg/parse/ret-type3.C b/gcc/testsuite/g++.dg/parse/ret-type3.C
new file mode 100644 (file)
index 0000000..33ee317
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/ret-type3.C
@@ -0,0 +1,8 @@
+// PR c++/21369
+
+struct bar;
+
+template <class T> struct bar *foo (T *p)
+{
+  return p->t;
+}