diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-02 22:44:33 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-02 22:44:33 +0900 |
| commit | ba4746749f0fed068f20c6770ac7d0524f1b2e54 (patch) | |
| tree | f800601fbe9af6234a8b6d042ddd025b4b242005 /src | |
| parent | de818e985973600527df80634b8803bebe84815e (diff) | |
| parent | 8d15ef2e89dededd92f09a52b2109ed0e9006042 (diff) | |
| download | mruby-ba4746749f0fed068f20c6770ac7d0524f1b2e54.tar.gz mruby-ba4746749f0fed068f20c6770ac7d0524f1b2e54.zip | |
Merge pull request #1990 from ksss/khash-bool-macro
Use bool macro KHASH_DEFINE and KHASH_DECLARE
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | src/hash.c | 4 | ||||
| -rw-r--r-- | src/kernel.c | 4 | ||||
| -rw-r--r-- | src/symbol.c | 4 | ||||
| -rw-r--r-- | src/variable.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/class.c b/src/class.c index 54cf598a3..656120845 100644 --- a/src/class.c +++ b/src/class.c @@ -16,7 +16,7 @@ #include "mruby/error.h" #include "mruby/data.h" -KHASH_DEFINE(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal) +KHASH_DEFINE(mt, mrb_sym, struct RProc*, TRUE, kh_int_hash_func, kh_int_hash_equal) void mrb_gc_mark_mt(mrb_state *mrb, struct RClass *c) diff --git a/src/hash.c b/src/hash.c index 7f6606956..076c9cb95 100644 --- a/src/hash.c +++ b/src/hash.c @@ -95,8 +95,8 @@ typedef struct { mrb_int n; } mrb_hash_value; -KHASH_DECLARE(ht, mrb_value, mrb_hash_value, 1) -KHASH_DEFINE (ht, mrb_value, mrb_hash_value, 1, mrb_hash_ht_hash_func, mrb_hash_ht_hash_equal) +KHASH_DECLARE(ht, mrb_value, mrb_hash_value, TRUE) +KHASH_DEFINE (ht, mrb_value, mrb_hash_value, TRUE, mrb_hash_ht_hash_func, mrb_hash_ht_hash_equal) static void mrb_hash_modify(mrb_state *mrb, mrb_value hash); diff --git a/src/kernel.c b/src/kernel.c index afba3e857..15a80f7c4 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -720,8 +720,8 @@ mrb_obj_is_kind_of_m(mrb_state *mrb, mrb_value self) return mrb_bool_value(kind_of_p); } -KHASH_DECLARE(st, mrb_sym, char, 0) -KHASH_DEFINE(st, mrb_sym, char, 0, kh_int_hash_func, kh_int_hash_equal) +KHASH_DECLARE(st, mrb_sym, char, FALSE) +KHASH_DEFINE(st, mrb_sym, char, FALSE, kh_int_hash_func, kh_int_hash_equal) static void method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) diff --git a/src/symbol.c b/src/symbol.c index e5db48858..87884d123 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -31,8 +31,8 @@ sym_hash_func(mrb_state *mrb, const symbol_name s) } #define sym_hash_equal(mrb,a, b) (a.len == b.len && memcmp(a.name, b.name, a.len) == 0) -KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1) -KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal) +KHASH_DECLARE(n2s, symbol_name, mrb_sym, TRUE) +KHASH_DEFINE (n2s, symbol_name, mrb_sym, TRUE, sym_hash_func, sym_hash_equal) /* ------------------------------------------------------ */ static mrb_sym sym_intern(mrb_state *mrb, const char *name, size_t len, mrb_bool lit) diff --git a/src/variable.c b/src/variable.c index 1d10ddb49..3dcdbf775 100644 --- a/src/variable.c +++ b/src/variable.c @@ -289,8 +289,8 @@ iv_free(mrb_state *mrb, iv_tbl *t) #define MRB_IVHASH_INIT_SIZE 8 #endif -KHASH_DECLARE(iv, mrb_sym, mrb_value, 1) -KHASH_DEFINE(iv, mrb_sym, mrb_value, 1, kh_int_hash_func, kh_int_hash_equal) +KHASH_DECLARE(iv, mrb_sym, mrb_value, TRUE) +KHASH_DEFINE(iv, mrb_sym, mrb_value, TRUE, kh_int_hash_func, kh_int_hash_equal) typedef struct iv_tbl { khash_t(iv) h; |