Workaround 'variable hides enumerator with same name' cppcheck warnings

* include/new_gc_alloc.h (GC_bytes_per_word, GC_word_alignment): Define
as const unsigned (instead of single-item enum) if CPPCHECK.

diff --git a/include/new_gc_alloc.h b/include/new_gc_alloc.h
index 8255b11b9ce93e2900c3fa6879fb45c54e9c5c31..fba2bfde33cb687aa71d4888f6015528d719d13a 100644 (file)
--- a/include/new_gc_alloc.h
+++ b/include/new_gc_alloc.h
@@ -98,11 +98,15 @@ enum { GC_PTRFREE = 0, GC_NORMAL = 1, GC_UNCOLLECTABLE = 2,
 
 enum { GC_max_fast_bytes = 255 };
 
-enum { GC_bytes_per_word = sizeof(char *) };
-
 enum { GC_byte_alignment = 8 };
 
-enum { GC_word_alignment = GC_byte_alignment/GC_bytes_per_word };
+#if defined(CPPCHECK)
+  const unsigned GC_bytes_per_word = sizeof(char *);
+  const unsigned GC_word_alignment = GC_byte_alignment/GC_bytes_per_word;
+#else
+  enum { GC_bytes_per_word = sizeof(char *) };
+  enum { GC_word_alignment = GC_byte_alignment/GC_bytes_per_word };
+#endif
 
 inline void * &GC_obj_link(void * p)
 {   return *reinterpret_cast<void **>(p);  }