patch::: 1.3.141.hwn3: Re: Sugar

[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 30ee56c2b28f2bf676814a177c7a9cb4a6df6b4f..e8688d3bcdfed2b776ca091cff411669aef48e3f 100644 (file)
--- a/lily/include/column-x-positions.hh
+++ b/lily/include/column-x-positions.hh
@@ -1,7 +1,7 @@
 /*
   column-x-positions.hh -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef COLUMN_X_POSITIONS_HH
@@ -13,14 +13,12 @@
 
 struct Column_x_positions
 {
-  Link_array<Paper_column> cols_;
+  Link_array<Grob> cols_;
   Array<Real> config_;
-  
   Real force_f_;
-  Real energy_f_;
   bool satisfies_constraints_b_;
 
-  Column_x_positions();
+  Column_x_positions ();
 };