aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>1998-10-25 19:17:06 -0500
committerJason Merrill <jason@gcc.gnu.org>1998-10-25 19:17:06 -0500
commit79df66708803f105ff7dda878adc551e696885aa (patch)
tree0435d3a6647e1aefe5983ac2c99077d266131ea4
parent0679e3fcb626d03ccdef64d4826c8ecac3b8a631 (diff)
downloadgcc-79df66708803f105ff7dda878adc551e696885aa.zip
gcc-79df66708803f105ff7dda878adc551e696885aa.tar.gz
gcc-79df66708803f105ff7dda878adc551e696885aa.tar.bz2
update
From-SVN: r23333
-rw-r--r--gcc/cp/parse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index fb1d896..e386188 100644
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -3649,7 +3649,7 @@ static const short yycheck[] = { 4,
78, 79, 80, 81, 82, 83, 84
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/cygnus/gnupro-98r1/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -3842,7 +3842,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
-#line 196 "/usr/lib/bison.simple"
+#line 196 "/usr/cygnus/gnupro-98r1/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -4908,7 +4908,7 @@ case 198:
{
cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, 1, LOOKUP_ONLYCONVERTING);
resume_momentary (yyvsp[-2].itype);
- yyval.ttype = yyvsp[-1].ttype;
+ yyval.ttype = convert_from_reference (yyvsp[-1].ttype);
if (TREE_CODE (TREE_TYPE (yyval.ttype)) == ARRAY_TYPE)
cp_error ("definition of array `%#D' in condition", yyval.ttype);
;
@@ -7873,7 +7873,7 @@ case 876:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/lib/bison.simple"
+#line 498 "/usr/cygnus/gnupro-98r1/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;