[HarfBuzz] remove trailing commas in enums

Jonathan Kew jonathan at jfkew.plus.com
Tue Oct 18 06:57:55 PDT 2011


For the sake of picky compilers that don't support this C99/C++11-ism, please ensure enums never have a trailing comma after the last value:

diff --git a/harfbuzz/src/hb-ot-shape-complex-indic.cc b/harfbuzz/src/hb-ot-shape-complex-indic.cc
--- a/harfbuzz/src/hb-ot-shape-complex-indic.cc
+++ b/harfbuzz/src/hb-ot-shape-complex-indic.cc
@@ -56,17 +56,17 @@ enum indic_category_t {
 };
 
 /* Visual positions in a syllable from left to right. */
 enum indic_position_t {
   POS_PRE,
   POS_BASE,
   POS_ABOVE,
   POS_BELOW,
-  POS_POST,
+  POS_POST
 };
 
 /* Categories used in IndicSyllabicCategory.txt from UCD */
 /* The assignments are guesswork */
 enum indic_syllabic_category_t {
   INDIC_SYLLABIC_CATEGORY_OTHER			= OT_X,
 
   INDIC_SYLLABIC_CATEGORY_AVAGRAHA		= OT_X,
@@ -316,17 +316,17 @@ enum {
   AKHN,
   RPHF,
   RKRF,
   PREF,
   BLWF,
   HALF,
   _VATU,
   PSTF,
-  CJCT,
+  CJCT
 };
 
 static const hb_tag_t indic_other_features[] =
 {
   HB_TAG('p','r','e','s'),
   HB_TAG('a','b','v','s'),
   HB_TAG('b','l','w','s'),
   HB_TAG('p','s','t','s'),
diff --git a/harfbuzz/src/hb-ot-shape-complex-private.hh b/harfbuzz/src/hb-ot-shape-complex-private.hh
--- a/harfbuzz/src/hb-ot-shape-complex-private.hh
+++ b/harfbuzz/src/hb-ot-shape-complex-private.hh
@@ -48,19 +48,20 @@
 
 #define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \
   HB_COMPLEX_SHAPER_IMPLEMENT (default) /* should be first */ \
   HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \
   HB_COMPLEX_SHAPER_IMPLEMENT (indic) \
   /* ^--- Add new shapers here */
 
 enum hb_ot_complex_shaper_t {
-#define HB_COMPLEX_SHAPER_IMPLEMENT(name) hb_ot_complex_shaper_##name,
-  HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS
-#undef HB_COMPLEX_SHAPER_IMPLEMENT
+  hb_ot_complex_shaper_default, /* should be first */
+  hb_ot_complex_shaper_arabic,
+  hb_ot_complex_shaper_indic
+  /* Add new shapers here */
 };
 
 static inline hb_ot_complex_shaper_t
 hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
 {
   switch ((int) props->script)
   {
     default:





More information about the HarfBuzz mailing list