X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=ad2ed5345d3575f775e17bbb0585f764c4ce4594;hb=207f71b8b2ab9ca550e841615bedce393e652ca6;hp=62b29e831894bf244f2b383e02a3ddc813032298;hpb=c8d62eca2d025e1fdce22f478f87c10f414d4b9d;p=lilypond.git diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh index 62b29e8318..ad2ed5345d 100644 --- a/lily/include/note-collision.hh +++ b/lily/include/note-collision.hh @@ -37,11 +37,11 @@ class Note_collision_interface { public: - static SCM automatic_shift (Grob *, Drul_array >); + static SCM automatic_shift (Grob *, Drul_array >); static SCM forced_shift (Grob *); - static std::vector note_head_positions (Grob *me); - static Drul_array > get_clash_groups (Grob *me); + static vector note_head_positions (Grob *me); + static Drul_array > get_clash_groups (Grob *me); DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob)); static void add_column (Grob *me, Grob *ncol); };