X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=119345ea59f154cc637c8e4533def55a5eab5504;hb=3e89af67bc6a9e3fd5d9a28db256608ac79510e0;hp=c2c6338a0a75b0d45666a4b1f13c4548a46592dd;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index c2c6338a0a..119345ea59 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,30 +1,44 @@
 /*
-  keyword.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2001 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 "std-vector.hh"
+
 /* for the keyword table */
 struct Keyword_ent
 {
-  char const *name;
-  int     tokcode;
+  char const *name_;
+  int tokcode_;
 };
 
 /*
   junkme, use  hash table.
- */
+*/
 struct Keyword_table
 {
-  Keyword_ent *table;
-  int     maxkey;
+  std::vector<Keyword_ent> table_;
+
   Keyword_table (Keyword_ent *);
-  int     lookup (char const *s) const;
+  vsize lookup (char const *s) const;
 };
 
-
 #endif // KEYWORD_HH