Run `make grand-replace'.

[lilypond.git] / lily / include / column-x-positions.hh

diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh
index 3e186c57aea45a8aadc0de50bca864035843c29a..9a254a66f293d63d738a355da96c136251c35cce 100644 (file)
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,26 +1,26 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
 #define COLUMN_X_POSITIONS_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 
-
 struct Column_x_positions
 {
-  Link_array<Grob> cols_;
-  Array<Real> config_;
-  Real force_f_;
-  bool satisfies_constraints_b_;
+  vector<Grob*> cols_;
+  vector<Grob*> loose_cols_;
 
-  Column_x_positions();
-};
+  vector<Real> config_;
+  Real force_;
+  bool satisfies_constraints_;
 
+  Column_x_positions ();
+};
 
 #endif // COLUMN_X_POSITIONS_HH