(yyuserMerge): Return void, not YYSTYPE.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index a40521b431f34a91b68a609ed031a20721da8893..1ec45264ae21215f40b1947033a784d3c5f41ba9 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -170,7 +170,7 @@ b4_syncline([@oline@], [@ofile@])],
 b4_syncline([@oline@], [@ofile@])[
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \
-   Current.end = Rhs[N].end;
+   ((Current).end = Rhs[N].end)
 #endif
 
 namespace yy
@@ -1019,7 +1019,7 @@ namespace yy
   inline std::ostream&
   operator<< (std::ostream& ostr, const Position& pos)
   {
-    if (pos.filename != "")
+    if (!pos.filename.empty ())
       ostr << pos.filename << ':';
     return ostr << pos.line << '.' << pos.column;
   }