Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / paper-column.hh

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index c182d6aa6c6887fde16665b0804b4e8349a0e8e6..be6ab9378dbca9c3e4653160b974366c0564140d 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -11,7 +11,6 @@
 
 #include "item.hh"
 #include "rod.hh"
-#include "lily-proto.hh"
 
 class Paper_column : public Item
 {
@@ -44,7 +43,7 @@ public:
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 
   DECLARE_GROB_INTERFACE();
-  static int get_rank (Grob *);
+  static int get_rank (Grob const *);
   static bool is_musical (Grob *);
   static Moment when_mom (Grob *);
   static bool is_used (Grob *);