summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-12 15:08:29 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-12 15:08:29 +0000
commit93f643d9572f69b101cdb45f63b78c77846faab4 (patch)
tree443aa50e69d1bba5308811f25a9f3cc9c31f3732 /lib
parent07df5779dd6a92346ed38d310243aa4fe6119a36 (diff)
merge revision(s) 17940:
* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in IPAddr#to_range. a patch from okkez <okkez000 AT gmail.com> in [ruby-dev:35091]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/ipaddr.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 23d74af451..fe963e406c 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -483,7 +483,7 @@ class IPAddr
if prefixlen
mask!(prefixlen)
else
- @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+ @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
end
end