From ccba946973f57f894d63b72ae1bcbb0ac6da0034 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sat, 19 Jul 2014 00:49:25 +0200 Subject: [PATCH] util.h: Use size_t for static array sizes --- binding-mruby/binding-util.cpp | 6 +++--- src/input.cpp | 2 +- src/util.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/binding-mruby/binding-util.cpp b/binding-mruby/binding-util.cpp index 8602344..2466609 100644 --- a/binding-mruby/binding-util.cpp +++ b/binding-mruby/binding-util.cpp @@ -100,19 +100,19 @@ MrbData::MrbData(mrb_state *mrb) { int arena = mrb_gc_arena_save(mrb); - for (int i = 0; i < excDataN; ++i) + for (size_t i = 0; i < excDataN; ++i) exc[excData[i].ind] = mrb_define_class(mrb, excData[i].str, mrb->eException_class); RClass *errnoMod = mrb_define_module(mrb, "Errno"); - for (int i = 0; i < enoExcDataN; ++i) + for (size_t i = 0; i < enoExcDataN; ++i) exc[enoExcData[i].ind] = mrb_define_class_under(mrb, errnoMod, enoExcData[i].str, mrb->eStandardError_class); exc[TypeError] = mrb_class_get(mrb, "TypeError"); exc[ArgumentError] = mrb_class_get(mrb, "ArgumentError"); - for (int i = 0; i < symDataN; ++i) + for (size_t i = 0; i < symDataN; ++i) symbols[symData[i].ind] = mrb_intern_cstr(mrb, symData[i].str); mrb_gc_arena_restore(mrb, arena); diff --git a/src/input.cpp b/src/input.cpp index 85a6d1f..3c71d9d 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -332,7 +332,7 @@ struct InputPrivate { int index; - if (code < 0 || code > mapToIndexN-1) + if (code < 0 || (size_t) code > mapToIndexN-1) index = 0; else index = mapToIndex[code]; diff --git a/src/util.h b/src/util.h index 17f76e4..7361532 100644 --- a/src/util.h +++ b/src/util.h @@ -103,7 +103,7 @@ inline bool contains(const C &c, const V &v) #define ARRAY_SIZE(obj) (sizeof(obj) / sizeof((obj)[0])) -#define elementsN(obj) const int obj##N = ARRAY_SIZE(obj) +#define elementsN(obj) const size_t obj##N = ARRAY_SIZE(obj) #define DECL_ATTR_DETAILED(name, type, keyword1, keyword2) \ keyword1 type get##name() keyword2; \