X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcolumn-x-positions.hh;h=a562235f9eb301718288802763aa4cc5d59265bf;hb=62a502b7a020a0414058b7bfda405f644e8261f5;hp=e5ae4f92bd67589d3dbf98a45f14806b062cc40d;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh index e5ae4f92bd..a562235f9e 100644 --- a/lily/include/column-x-positions.hh +++ b/lily/include/column-x-positions.hh @@ -1,28 +1,26 @@ /* column-x-positions.hh -- part of GNU LilyPond - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #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 cols_; - Link_array loose_cols_; - - Array config_; + vector cols_; + vector loose_cols_; + + vector config_; Real force_; - bool satisfies_constraints_b_; + bool satisfies_constraints_; Column_x_positions (); }; - #endif // COLUMN_X_POSITIONS_HH