c.m4: style fix

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index b49028f9559ac6ec0236486def75ea0fa92451c8..b65bf49062fed54075a8aee54a872f81b5013859 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -124,8 +124,9 @@ m4_define([b4_position_define],
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
    */
    ** \param ostr the destination output stream
    ** \param pos a reference to the position to redirect
    */

-  inline std::ostream&
-  operator<< (std::ostream& ostr, const position& pos)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)

   {
     if (pos.filename)
       ostr << *pos.filename << ':';
   {
     if (pos.filename)
       ostr << *pos.filename << ':';


@@ -248,7 +249,9 @@ m4_define([b4_location_define],
    **
    ** Avoid duplicate information.
    */
    **
    ** Avoid duplicate information.
    */

-  inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)

   {
     position last = loc.end - 1;
     ostr << loc.begin;
   {
     position last = loc.end - 1;
     ostr << loc.begin;


@@ -265,8 +268,6 @@ m4_define([b4_location_define],
 ]])
 
 
 ]])
 
 

-# We do want M4 expansion after # for CPP macros.
-m4_changecom()

 b4_defines_if([
 b4_output_begin([b4_dir_prefix[]position.hh])
 b4_copyright([Positions for Bison parsers in C++])[
 b4_defines_if([
 b4_output_begin([b4_dir_prefix[]position.hh])
 b4_copyright([Positions for Bison parsers in C++])[