* flower/include/std-string.hh:

[lilypond.git] / lily / include / note-collision.hh

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 70be17119ccf81ffe1ed5d0af4b12448beb2916e..11f578ce8152da85c0abe7727b51494937905d97 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -26,10 +26,10 @@
 class Note_collision_interface
 {
 public:
-  static SCM automatic_shift (Grob *, Drul_array<Link_array__Grob_ >);
+  static SCM automatic_shift (Grob *, Drul_array<vector<Grob*> >);
   static SCM forced_shift (Grob *);
 
-  static Drul_array<Link_array__Grob_ > get_clash_groups (Grob *me);
+  static Drul_array<vector<Grob*> > get_clash_groups (Grob *me);
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob));
   static void add_column (Grob *me, Grob *ncol);
   static bool has_interface (Grob *);