Merge remote-tracking branch 'origin/maint'

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index 5879ea374e581bf331b67d30a67baa3c589cb5b1..b49028f9559ac6ec0236486def75ea0fa92451c8 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -268,8 +268,7 @@ m4_define([b4_location_define],
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 b4_defines_if([
-m4_divert_push(0)dnl
-@output(b4_dir_prefix[]position.hh@)@
+b4_output_begin([b4_dir_prefix[]position.hh])
 b4_copyright([Positions for Bison parsers in C++])[
 
 /**
@@ -289,7 +288,10 @@ b4_copyright([Positions for Bison parsers in C++])[
 ]b4_position_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
-@output(b4_dir_prefix[]location.hh@)@
+b4_output_end()
+
+
+b4_output_begin([b4_dir_prefix[]location.hh])
 b4_copyright([Locations for Bison parsers in C++])[
 
 /**
@@ -305,7 +307,8 @@ b4_copyright([Locations for Bison parsers in C++])[
 ]b4_location_define[
 ]b4_namespace_close[
 ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
-m4_divert_pop(0)
-])# b4_defines_if
-m4_popdef([b4_copyright_years])dnl
-m4_changecom([#])
+b4_output_end()
+])
+
+
+m4_popdef([b4_copyright_years])