X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=0f36fe812b2229bdbf951fdcf3844012b805ea68;hb=6316d6cdcc9ca46c2b72ecb5ff8cce92b5f38305;hp=cd4fa00f9a7003a432f12e320a84ea180244a680;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index cd4fa00f9a..0f36fe812b 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,13 +1,26 @@
 /*
-  keyword.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  Copyright (C) 1996--2015 Han-Wen Nienhuys
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef KEYWORD_HH
 #define KEYWORD_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 
 /* for the keyword table */
 struct Keyword_ent
@@ -21,10 +34,10 @@ struct Keyword_ent
 */
 struct Keyword_table
 {
-  Array<Keyword_ent> table_;
+  vector<Keyword_ent> table_;
 
   Keyword_table (Keyword_ent *);
-  int lookup (char const *s) const;
+  vsize lookup (char const *s) const;
 };
 
 #endif // KEYWORD_HH