From: Janek Warchoł <lemniskata.bernoullego@gmail.com>
Date: Sun, 29 Jun 2014 20:58:45 +0000 (+0200)
Subject: Rename argument to avoid preprocessor problems
X-Git-Tag: release/2.19.9-1^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7c6becbfa9deba7e58af8780e3ea2627169d5c4e;p=lilypond.git

Rename argument to avoid preprocessor problems

Before this change, we were getting the following error with GUB:

/home/gub/gub/target/mingw/src/
lilypond-git.sv.gnu.org--lilypond.git-release-unstable/
lily/include/paper-column.hh:62:
error: expected identifier before ',' token
/home/gub/gub/target/mingw/src/
lilypond-git.sv.gnu.org--lilypond.git-release-unstable/
lily/include/paper-column.hh:62:
error: two or more data types in declaration of 'parameter'

David Kastrup suspects that the library/compiler used for bootstrapping
has a macro or reserved word defined for "interface" - changing the name
makes the problem go away.
---

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 408f001d63..c0c33b268d 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -59,7 +59,7 @@ public:
   static bool is_extraneous_column_from_ligature (Grob *);
   static Real minimum_distance (Grob *l, Grob *r);
   static Interval break_align_width (Grob *me, SCM align_sym);
-  static Interval get_interface_extent (Grob *column, SCM interface, Axis a);
+  static Interval get_interface_extent (Grob *column, SCM iface, Axis a);
 };
 
 #endif // PAPER_COLUMN_HH
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 3e6988de0c..1cb1452c85 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -223,13 +223,13 @@ Paper_column::break_align_width (Grob *me, SCM align_sym)
   interface and return their combined extent.
 */
 Interval
-Paper_column::get_interface_extent (Grob *column, SCM interface, Axis a)
+Paper_column::get_interface_extent (Grob *column, SCM iface, Axis a)
 {
   Interval extent = Interval (0, 0);
   extract_grob_set (column, "elements", elts);
 
   for (vsize i = 0; i < elts.size (); i++)
-    if (elts[i]->internal_has_interface (interface))
+    if (elts[i]->internal_has_interface (iface))
       extent.unite (robust_relative_extent (elts[i], elts[i], a));
 
   return extent;