* lily/instrument-name-engraver.cc (stop_translation_timestep):

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

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 1ee059b637181b726cedeb989d7f7d19280bba7b..16c9494ed6ff78229e2ddbbc24258906ad8e45f2 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -9,7 +9,7 @@
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 
@@ -29,7 +29,7 @@ struct Spring_description
 class Simple_spacer
 {
 public:
-  Array<Spring_description> springs_;
+  std::vector<Spring_description> springs_;
   Real force_;
   Real indent_;
   Real line_len_;
@@ -56,11 +56,11 @@ public:
 struct Simple_spacer_wrapper
 {
   Simple_spacer *spacer_;
-  Link_array<Grob> spaced_cols_;
-  Link_array<Grob> loose_cols_;
+  Link_array__Grob_ spaced_cols_;
+  Link_array__Grob_ loose_cols_;
 
   Simple_spacer_wrapper ();
-  void add_columns (Link_array<Grob> const &);
+  void add_columns (Link_array__Grob_ const &);
   void solve (Column_x_positions *, bool);
   ~Simple_spacer_wrapper ();
 private: