Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / flower / include / interval-set.hh

diff --git a/flower/include/interval-set.hh b/flower/include/interval-set.hh
index 4c0ba0ac6a39d949d0da35d38a20a2c8bfb64e75..eda3a5ef26e885a8673c3ab4afac2467ec12254d 100644 (file)
--- a/flower/include/interval-set.hh
+++ b/flower/include/interval-set.hh
@@ -9,7 +9,7 @@
 #ifndef INTERVAL_SET_HH
 #define INTERVAL_SET_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
 /*
@@ -21,7 +21,7 @@
 */
 struct Interval_set
 {
-  Array<Interval> allowed_regions_;
+  vector<Interval> allowed_regions_;
 
   Interval_set ();
   void set_full ();