X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fconstrained-breaking.hh;h=e35fcc0bbecf03db6906d6a535f753b85ebcefeb;hb=28d3a736534f3aa3cd403485770a019bd35114c4;hp=bb8dcf0c3cc6e56928f5d6e09f2ab3a2a64563c1;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index bb8dcf0c3c..e35fcc0bbe 100644
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -45,10 +45,10 @@ struct Line_details
   Grob *last_column_;
   Real force_;
   Line_shape shape_;
-  std::vector<Real> footnote_heights_; /* The footnotes at the bottom of the
+  vector<Real> footnote_heights_; /* The footnotes at the bottom of the
                                    page, where each stencil represents
                                    a different footnote. */
-  std::vector<Real> in_note_heights_; /* The in-notes under a system,
+  vector<Real> in_note_heights_; /* The in-notes under a system,
                                    where each stencil represents
                                    a different in-note. */
   Interval refpoint_extent_; /* The refpoints of the first and last
@@ -154,12 +154,12 @@ struct Constrained_break_node
 class Constrained_breaking
 {
 public:
-  std::vector<Column_x_positions> solve (vsize start, vsize end, vsize sys_count);
-  std::vector<Column_x_positions> best_solution (vsize start, vsize end);
-  std::vector<Line_details> line_details (vsize start, vsize end, vsize sys_count);
+  vector<Column_x_positions> solve (vsize start, vsize end, vsize sys_count);
+  vector<Column_x_positions> best_solution (vsize start, vsize end);
+  vector<Line_details> line_details (vsize start, vsize end, vsize sys_count);
 
   Constrained_breaking (Paper_score *ps);
-  Constrained_breaking (Paper_score *ps, std::vector<vsize> const &start_col_posns);
+  Constrained_breaking (Paper_score *ps, vector<vsize> const &start_col_posns);
 
   int max_system_count (vsize start, vsize end);
   int min_system_count (vsize start, vsize end);
@@ -186,13 +186,13 @@ private:
 
   /* the [i](j,k)th entry is the score for fitting the first k bars onto the
     first j systems, starting at the i'th allowed starting column */
-  std::vector<Matrix<Constrained_break_node> > state_;
+  vector<Matrix<Constrained_break_node> > state_;
 
-  std::vector<vsize> start_;         /* the columns at which we might be asked to start breaking */
-  std::vector<vsize> starting_breakpoints_; /* the corresponding index in breaks_ */
+  vector<vsize> start_;         /* the columns at which we might be asked to start breaking */
+  vector<vsize> starting_breakpoints_; /* the corresponding index in breaks_ */
 
-  std::vector<Grob *> all_;
-  std::vector<vsize> breaks_;
+  vector<Grob *> all_;
+  vector<vsize> breaks_;
 
   void initialize ();
   void resize (vsize systems);