2014-06-29 22:09 GMT+02:00 David Kastrup <d...@gnu.org>:
> Phil Holmes <m...@philholmes.net> writes:
>
>> I'm sorry to say that one of Janek's updates appears to have stopped GUB
>> from compiling. It fails on compiling the mingw component as follows:
I'm sorry to hear that :(
>> /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'
>
> I cannot fathom the error. The only guess I have is that the
> library/compiler used for bootstrapping has a macro or reserved word
> defined for "interface". In which case using a different identifier
> would likely help.
>
> Or this is a followup error. But the line, by itself, looks inconspicuous.
I don't have any better idea. Phil, could you try the attached patch
and see if this helps? I don't have GUB set up, and i probably won't
have the opportinuty to set it up for myself soon.
thanks,
Janek
From d2b26d7a85cfb7c3523ef614b414e6fd298bb8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janek=20Warcho=C5=82?= <lemniskata.bernoull...@gmail.com>
Date: Sun, 29 Jun 2014 22:58:45 +0200
Subject: [PATCH] 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", so changing the name
hopefully will help.
---
lily/include/paper-column.hh | 2 +-
lily/paper-column.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 408f001..c4b9b2a 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -52,14 +52,14 @@ public:
DECLARE_GROB_INTERFACE ();
static int get_rank (Grob const *);
static bool is_musical (Grob *);
static Moment when_mom (Grob *);
static bool is_used (Grob *);
static bool is_breakable (Grob *);
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 interf, Axis a);
};
#endif // PAPER_COLUMN_HH
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 3e6988d..ff21d47 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -216,27 +216,27 @@ Paper_column::break_align_width (Grob *me, SCM align_sym)
return Interval (0, 0) + me->relative_coordinate (p, X_AXIS);
return align->extent (p, X_AXIS);
}
/*
Loop through elements of a PaperColumn, find all grobs implementing specified
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 interf, 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 (interf))
extent.unite (robust_relative_extent (elts[i], elts[i], a));
return extent;
}
/*
Print a:
- vertical line,
- the rank number,
- rank moment,
--
2.0.0
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
