* Another grand 2003 update.

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

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index e8674d9aeb2380525db4bb22b52b7e7b88c0d08f..1eacaa06d7b6d0861ddb0ff95a98aaaa6cc15729 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,6 +13,8 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
+#include "drul-array.hh"
+#include "parray.hh"
 
 /**
   Resolve conflicts between various Note_columns (chords).
@@ -34,7 +36,7 @@ public:
   static Drul_array< Link_array <Grob>  > get_clash_groups (Grob *me);
   DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
   static void do_shifts (Grob*);
-  static void add_column (Grob*me,Grob*ncol_l);
+  static void add_column (Grob*me,Grob*ncol);
   static bool has_interface(Grob*);
 };
 #endif // COLLISION_HH