* flower/include/std-string.hh:

[lilypond.git] / lily / include / slur-scoring.hh

diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index 51be36672cb1a224a071587061fe273cfc6ac126..0164116a148cee6cb629d4558a3ed6633231455c 100644 (file)
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -104,15 +104,15 @@ struct Slur_score_state
   bool has_same_beam_;
 
   Real musical_dy_;
-  Link_array__Grob_ columns_;
-  std::vector<Encompass_info> encompass_infos_;
-  std::vector<Extra_collision_info> extra_encompass_infos_;
+  vector<Grob*> columns_;
+  vector<Encompass_info> encompass_infos_;
+  vector<Extra_collision_info> extra_encompass_infos_;
 
   Direction dir_;
   Slur_score_parameters parameters_;
   Drul_array<Bound_info> extremes_;
   Drul_array<Offset> base_attachments_;
-  Link_array__Slur_configuration_ configurations_;
+  vector<Slur_configuration*> configurations_;
   Real staff_space_;
   Real thickness_;
 
@@ -123,14 +123,14 @@ struct Slur_score_state
   void fill (Grob *);
   void set_next_direction ();
 
-  std::vector<Offset> generate_avoid_offsets () const;
+  vector<Offset> generate_avoid_offsets () const;
   Drul_array<Bound_info> get_bound_info () const;
   void generate_curves () const;
-  Link_array__Slur_configuration_ enumerate_attachments (Drul_array<Real> end_ys) const;
+  vector<Slur_configuration*> enumerate_attachments (Drul_array<Real> end_ys) const;
   Drul_array<Offset> get_base_attachments () const;
   Drul_array<Real> get_y_attachment_range () const;
   Encompass_info get_encompass_info (Grob *col) const;
-  std::vector<Extra_collision_info> get_extra_encompass_infos () const;
+  vector<Extra_collision_info> get_extra_encompass_infos () const;
   Real move_away_from_staffline (Real y, Grob *on_staff) const;
   int get_closest_index (SCM inspect_quants) const;
 };