X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=39fa8e1bda85ef6eb989d07bf49c2f5bf68d71df;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=6afe56826281e1db3382fa484d500e45da3fcd11;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 6afe568262..39fa8e1bda 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,8 +28,7 @@ class Rest_collision
 public:
   static void add_column (Grob *me, Grob *);
 
-  DECLARE_GROB_INTERFACE();
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element));
+  DECLARE_GROB_INTERFACE ();
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
   DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM off));
   static SCM do_shift (Grob *);