X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkeyword.cc;h=70c84e59e2a6bfc9719f08dd62d41a171ba51444;hb=1eb080d3e3acfe927eb163abb8c5ca6e08b43769;hp=de6aca9e495cd7a6c6496384a0c3d7e2d6b377ca;hpb=528e7b6840aa4bd8e23f69c3f6842b124cee26ae;p=lilypond.git

diff --git a/lily/keyword.cc b/lily/keyword.cc
index de6aca9e49..70c84e59e2 100644
--- a/lily/keyword.cc
+++ b/lily/keyword.cc
@@ -1,13 +1,14 @@
 /*
   keyword.cc -- keywords and identifiers
- */
-#include <string.h>
-#include <stdlib.h>
+*/
+
 #include "keyword.hh"
 
+#include <cstring>
+#include <cstdlib>
 
 /* for qsort */
-int tabcmp (Keyword_ent  const &p1, Keyword_ent const &p2)
+int tabcmp (Keyword_ent const &p1, Keyword_ent const &p2)
 {
   return strcmp (p1.name_, p2.name_);
 }
@@ -15,9 +16,7 @@ int tabcmp (Keyword_ent  const &p1, Keyword_ent const &p2)
 Keyword_table::Keyword_table (Keyword_ent *tab)
 {
   while (tab->name_)
-    {
-      table_.push (*tab++);
-    }
+    table_.push (*tab++);
 
   table_.sort (tabcmp);
 }
@@ -25,8 +24,8 @@ Keyword_table::Keyword_table (Keyword_ent *tab)
 int
 Keyword_table::lookup (char const *s) const
 {
-  Keyword_ent e ;
-  e.name_ =  s;
+  Keyword_ent e;
+  e.name_ = s;
   int idx = binary_search (table_, e, tabcmp);
   if (idx >= 0)
     return table_[idx].tokcode_;