summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-11 15:25:31 +0000
committerglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-11 15:25:31 +0000
commit7a171aa8d1b2c482ab2957da2f8901e64db0082a (patch)
tree74d6279092ab54bb80fd281cd579087f5a6332c9
parent76a400ff712d57dab9e9d46a2278c43fa8d34f0d (diff)
* hash.c (rb_hash_size): use RHASH_SIZE().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--hash.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e268132ce..262ddc7c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 12 00:20:00 2013 Masaki Matsushita <glass.saga@gmail.com>
+
+ * hash.c (rb_hash_size): use RHASH_SIZE().
+
Fri Jul 12 00:08:24 2013 Masaki Matsushita <glass.saga@gmail.com>
* hash.c (rb_hash_values): set array capa to RHASH_SIZE().
diff --git a/hash.c b/hash.c
index 8321a9f4ad..7997b2e681 100644
--- a/hash.c
+++ b/hash.c
@@ -1379,9 +1379,7 @@ rb_hash_replace(VALUE hash, VALUE hash2)
static VALUE
rb_hash_size(VALUE hash)
{
- if (!RHASH(hash)->ntbl)
- return INT2FIX(0);
- return INT2FIX(RHASH(hash)->ntbl->num_entries);
+ return INT2FIX(RHASH_SIZE(hash));
}