* configure.in (--enable-std-vector): New option.

[lilypond.git] / lily / include / keyword.hh

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index cd4fa00f9a7003a432f12e320a84ea180244a680..dfd355e1afed3ead4352908bf0945ad068b76abc 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -7,7 +7,7 @@
 #ifndef KEYWORD_HH
 #define KEYWORD_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 
 /* for the keyword table */
 struct Keyword_ent
@@ -21,10 +21,10 @@ struct Keyword_ent
 */
 struct Keyword_table
 {
-  Array<Keyword_ent> table_;
+  std::vector<Keyword_ent> table_;
 
   Keyword_table (Keyword_ent *);
-  int lookup (char const *s) const;
+  vsize lookup (char const *s) const;
 };
 
 #endif // KEYWORD_HH