Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / include / spacing-spanner.hh

diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh
index d24b6008ec60f06995dd0183558fdc56268cd2e1..fcfba904175f8a4a830306f557dd587f6bb8c4e8 100644 (file)
--- a/lily/include/spacing-spanner.hh
+++ b/lily/include/spacing-spanner.hh
@@ -35,16 +35,16 @@ private:
                                      Paper_column *nextr,
                                      Spacing_options const *options);
   static Real default_bar_spacing (Grob *, Grob *, Grob *, Moment);
-  static Rational effective_shortest_duration (Grob *me, std::vector<Grob *> const &all);
+  static Rational effective_shortest_duration (Grob *me, vector<Grob *> const &all);
   static void breakable_column_spacing (Grob *, Item *l, Item *r, Spacing_options const *);
-  static void prune_loose_columns (Grob *, std::vector<Grob *> *cols, Spacing_options *);
-  static void set_explicit_neighbor_columns (std::vector<Grob *> const &cols);
-  static void set_implicit_neighbor_columns (std::vector<Grob *> const &cols);
-  static void generate_springs (Grob *me, std::vector<Grob *> const &cols, Spacing_options const *);
+  static void prune_loose_columns (Grob *, vector<Grob *> *cols, Spacing_options *);
+  static void set_explicit_neighbor_columns (vector<Grob *> const &cols);
+  static void set_implicit_neighbor_columns (vector<Grob *> const &cols);
+  static void generate_springs (Grob *me, vector<Grob *> const &cols, Spacing_options const *);
   static void musical_column_spacing (Grob *, Item *, Item *, Spacing_options const *);
   static bool fills_measure (Grob *, Item *, Item *);
 public:
-  static std::vector<Grob *> get_columns (Grob *me);
+  static vector<Grob *> get_columns (Grob *me);
   static Spring note_spacing (Grob *, Grob *, Grob *, Spacing_options const *);
   static Spring standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *);