diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:42:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:42:27 +0000 |
| commit | c8f2479c6b50e3547f3f0bd48dfa3d9dca639e29 (patch) | |
| tree | b110f557227f30ba75c58809e73777cfb3e982ad /regparse.c | |
| parent | 18488c1117dfcb492694b2733cd96dba3602aae3 (diff) | |
merge revision(s) 32688,33309,33408,33864,35874,38012: [Backport #7832]
* vm_method.c (rb_gc_mark_unlinked_live_method_entries): remove unused
variables.
* vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
`volatile type *var' doesn't make var itself volatile.
* vm_insnhelper.c (vm_call_cfunc): remove useless hack.
* regparse.c (onig_number_of_names): suppress a warning.
* gc.c : remove a unused function.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regparse.c b/regparse.c index 1369c86d41..40c4aa580e 100644 --- a/regparse.c +++ b/regparse.c @@ -579,7 +579,7 @@ onig_number_of_names(regex_t* reg) NameTable* t = (NameTable* )reg->name_table; if (IS_NOT_NULL(t)) - return t->num_entries; + return (int)t->num_entries; else return 0; } |