* parse.y (primary): Fix up the type of string constants.

From-SVN: r21939

gcc/cp/ChangeLog

+1998-08-24  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* parse.y (primary): Fix up the type of string constants.
+
 1998-08-24  Mark Mitchell  <mark@markmitchell.com>
 
 	* typeck.c (convert_for_initialization): Move check for odd uses

gcc/cp/parse.y

@@ -1356,6 +1356,10 @@ primary:
 		  if (processing_template_decl)
 		    push_obstacks (&permanent_obstack, &permanent_obstack);
 		  $$ = combine_strings ($$);
+		  if (flag_const_strings)
+		    TREE_TYPE ($$) = build_cplus_array_type
+		      (TREE_TYPE (TREE_TYPE ($$)),
+		       TYPE_DOMAIN (TREE_TYPE ($$)));
 		  if (processing_template_decl)
 		    pop_obstacks ();
 		}