release: 0.0.70pre

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index d470e4178e265bdbfdbb0c0d7a2d37b933a95732..a2a39754be60780727dc5242e416819bfaabe43d 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -17,11 +17,15 @@ class Rest_collision : public Item {
     Link_array<Rest_column> rest_l_arr_;
     Link_array<Note_column> ncol_l_arr_;
 public:
+    void add(Note_column*);
     void add(Rest_column*);
     void add(Collision*);
-    NAME_MEMBERS(Rest_collision);
+    NAME_MEMBERS();
+    Rest_collision();
 protected:
     virtual void do_post_processing();
+    virtual void do_pre_processing();
+    virtual void do_print() const;
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
 };
 #endif // REST_COLLISION_HH