shyouhei	2008-07-13 00:08:29 +0900 (Sun, 13 Jul 2008)

  New Revision: 18049

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18049

  Log:
    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].

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/ipaddr.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18048)
+++ ruby_1_8_7/ChangeLog	(revision 18049)
@@ -1,3 +1,9 @@
+Sun Jul 13 00:08:16 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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].
+
 Sun Jul 13 00:04:38 2008  Tanaka Akira  <akr@f...>
 
 	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18048)
+++ ruby_1_8_7/version.h	(revision 18049)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-13"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080713
-#define RUBY_PATCHLEVEL 57
+#define RUBY_PATCHLEVEL 58
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/ipaddr.rb
===================================================================
--- ruby_1_8_7/lib/ipaddr.rb	(revision 18048)
+++ ruby_1_8_7/lib/ipaddr.rb	(revision 18049)
@@ -483,7 +483,7 @@
     if prefixlen
       mask!(prefixlen)
     else
-      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+      @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
     end
   end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/