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

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 39d9a3f853062cfd3eab5f0654fddd30f9e01fd2..c8033487744343b048be924e2ff7b53e154c8c35 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -51,7 +51,7 @@ public:
   Real force () const;
   bool fits () const;
 
-  DECLARE_SIMPLE_SMOBS (Simple_spacer,);
+  DECLARE_SIMPLE_SMOBS (Simple_spacer);
 
 private:
   Real expand_line ();
@@ -67,7 +67,6 @@ private:
 
 /* returns a vector of dimensions breaks.size () * breaks.size () */
 vector<Real> get_line_forces (vector<Grob*> const &columns,
-                             vector<vsize> breaks,
                              Real line_len,
                              Real indent,
                              bool ragged);