* ly/engraver-init.ly: Make FiguredBass accepted in GrandStaff and

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index 4a59a069be9ae407f2b5786d87eff2f92d76d288..9dd66cef9a4124658bf447b14d81dc1f9ecac1d1 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -368,7 +368,7 @@ Beam::get_beam_segments (Grob *me_grob, Grob **common)
        i != stem_segments.end (); i++)
     {
       vector<Beam_stem_segment> segs = (*i).second;
-      vector_sort (segs, less<Beam_stem_segment> ());
+      vector_sort (segs, default_compare);
 
       Beam_segment current;
 
@@ -1301,7 +1301,7 @@ Beam::last_visible_stem (Grob *me)
 
   rest -> stem -> beam -> interpolate_y_position ()
 */
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1);
+MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2);
 SCM
 Beam::rest_collision_callback (SCM smob, SCM prev_offset)
 {