summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-12 15:07:29 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-12 15:07:29 +0000
commitb3470a1a45fef7c117cb06a5a90b1ff5ff2e7f1e (patch)
tree149319c051e946cf40f03361e36377839cee8f41 /lib
parent40e3baf292e77d7bfa1a7ffc56ba16bc232b49b0 (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_6@18047 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 17e47f016f..1801d9d86f 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -438,7 +438,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