GCC 4 fix.

[lilypond.git] / lily / include / break-algorithm.hh

diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh
index 829c1fc91bef4f6895970e62f6f6bc6677474bc0..e3cf8c115a8f2caa832d82b236b39a924e911d6a 100644 (file)
--- a/lily/include/break-algorithm.hh
+++ b/lily/include/break-algorithm.hh
@@ -23,21 +23,16 @@ protected:
   Paper_score *pscore_;
   Real linewidth_;
 
-  Link_array<Grob> find_breaks () const;
-  Array<int> find_break_indices () const;
+  vector<Grob*> find_breaks () const;
   void solve_line (Column_x_positions *) const;
-  bool feasible (Link_array<Grob> const &) const;
-
-  Simple_spacer_wrapper *generate_spacing_problem (Link_array<Grob> const &,
-                                                  Interval) const;
-  virtual Array<Column_x_positions> do_solve () const = 0;
+  bool feasible (vector<Grob*> const &) const;
 
 public:
   virtual ~Break_algorithm ();
   Simple_spacer *(*get_line_spacer) ();
   Break_algorithm ();
   void set_pscore (Paper_score *);
-  Array<Column_x_positions> solve () const;
+  virtual vector<Column_x_positions> solve ();
 };
 
 #endif // BREAK_HH