X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkeyword.cc;h=b5f7947ada203e31550ee041a557f37f439b115c;hb=646a2265ea72c4007d9590a5d6d9a10ffc54ef29;hp=84065ab4f6fd0093f621e0d87d3a351b9f027ab3;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/lily/keyword.cc b/lily/keyword.cc index 84065ab4f6..b5f7947ada 100644 --- a/lily/keyword.cc +++ b/lily/keyword.cc @@ -9,9 +9,9 @@ using namespace std; /* for qsort */ -int tabcmp (Keyword_ent const &p1, Keyword_ent const &p2) +bool tab_less (Keyword_ent const &p1, Keyword_ent const &p2) { - return strcmp (p1.name_, p2.name_); + return strcmp (p1.name_, p2.name_) < 0; } Keyword_table::Keyword_table (Keyword_ent *tab) @@ -19,7 +19,7 @@ Keyword_table::Keyword_table (Keyword_ent *tab) while (tab->name_) table_.push_back (*tab++); - vector_sort (table_, tabcmp); + vector_sort (table_, tab_less); } vsize @@ -27,7 +27,7 @@ Keyword_table::lookup (char const *s) const { Keyword_ent e; e.name_ = s; - vsize idx = binary_search (table_, e, tabcmp); + vsize idx = binary_search (table_, e, tab_less); if (idx != VPOS) return table_[idx].tokcode_; return VPOS;