*** empty log message ***

[lilypond.git] / lily / tuplet-engraver.cc

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 3d24023e41badd58d754d35a1ab81843dd5be52a..0d0966899cf138f1348cf42684a83cf5f7d04287 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -40,8 +40,8 @@ public:
   TRANSLATOR_DECLARATIONS (Tuplet_engraver);
 
 protected:
-  std::vector<Tuplet_description> tuplets_;
-  Link_array<Spanner> last_tuplets_;
+  vector<Tuplet_description> tuplets_;
+  vector<Spanner*> last_tuplets_;
   DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *r);
   virtual void finalize ();
@@ -80,7 +80,7 @@ Tuplet_engraver::process_music ()
   if (!tuplets_.size ())
     return;
 
-  tuplets_.sort (&Tuplet_description::compare);
+  vector_sort (tuplets_, Tuplet_description::compare);
   for (vsize i = 0; i < tuplets_.size (); i++)
     {
       if (tuplets_[i].bracket_)
@@ -166,7 +166,7 @@ Tuplet_engraver::start_translation_timestep ()
        }
 
       if (now.main_part_ >= tuplets_[i].stop_)
-       tuplets_.del (i);
+       tuplets_.erase (tuplets_.begin () + i);
     }
 }