tenderlove	2012-10-31 02:54:34 +0900 (Wed, 31 Oct 2012)

  New Revision: 37391

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

  Log:
    * ext/dl/lib/dl/struct.rb: fix strange require order. [ruby-dev:45702]
    
    * ext/dl/lib/dl/value.rb: ditto
    
    * test/dl/test_c_struct_entry.rb: remove strange require order from
      tests.
    
    * test/dl/test_c_union_entity.rb: ditto

  Modified files:
    trunk/ChangeLog
    trunk/ext/dl/lib/dl/struct.rb
    trunk/ext/dl/lib/dl/value.rb
    trunk/test/dl/test_c_struct_entry.rb
    trunk/test/dl/test_c_union_entity.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37390)
+++ ChangeLog	(revision 37391)
@@ -1,3 +1,14 @@
+Wed Oct 31 02:53:07 2012  Aaron Patterson <aaron@t...>
+
+	* ext/dl/lib/dl/struct.rb: fix strange require order. [ruby-dev:45702]
+
+	* ext/dl/lib/dl/value.rb: ditto
+
+	* test/dl/test_c_struct_entry.rb: remove strange require order from
+	  tests.
+
+	* test/dl/test_c_union_entity.rb: ditto
+
 Tue Oct 30 23:59:32 2012  Shugo Maeda  <shugo@r...>
 
 	* eval.c (rb_mod_refine): fix the error message when no block is
Index: ext/dl/lib/dl/struct.rb
===================================================================
--- ext/dl/lib/dl/struct.rb	(revision 37390)
+++ ext/dl/lib/dl/struct.rb	(revision 37391)
@@ -1,4 +1,5 @@
 require 'dl'
+require 'dl/value'
 require 'dl/pack.rb'
 
 module DL
Index: ext/dl/lib/dl/value.rb
===================================================================
--- ext/dl/lib/dl/value.rb	(revision 37390)
+++ ext/dl/lib/dl/value.rb	(revision 37391)
@@ -46,6 +46,8 @@
     end
 
     def wrap_arg(arg, ty, funcs = [], &block)
+        require 'dl/func'
+
         funcs ||= []
         case arg
         when nil
Index: test/dl/test_c_union_entity.rb
===================================================================
--- test/dl/test_c_union_entity.rb	(revision 37390)
+++ test/dl/test_c_union_entity.rb	(revision 37391)
@@ -1,7 +1,5 @@
 require_relative 'test_base'
 
-require 'dl/func'
-require 'dl/value'
 require 'dl/struct'
 
 class DL::TestCUnionEntity < DL::TestBase
Index: test/dl/test_c_struct_entry.rb
===================================================================
--- test/dl/test_c_struct_entry.rb	(revision 37390)
+++ test/dl/test_c_struct_entry.rb	(revision 37391)
@@ -1,7 +1,5 @@
 require_relative 'test_base'
 
-require 'dl/func'
-require 'dl/value'
 require 'dl/struct'
 
 class DL::TestCStructEntity < DL::TestBase

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