nobu	2012-05-24 18:51:20 +0900 (Thu, 24 May 2012)

  New Revision: 35771

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

  Log:
    vm.c: suppress 64-to-32 warnings
    
    * vm.c (backtrace_object): suppress 64-to-32 warnings.  should adjust
      types.

  Modified files:
    trunk/ChangeLog
    trunk/vm.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35770)
+++ ChangeLog	(revision 35771)
@@ -9,7 +9,7 @@
 Thu May 24 14:30:13 2012  Koichi Sasada  <ko1@a...>
 
 	* vm.c: add RubyVM::Backtrace object (btobj).
-	  Backtrace information contains an array consists of location 
+	  Backtrace information contains an array consists of location
           information for each frames by string.
 	  RubyVM::Backtrace object is lightweight backtrace information,
 	  which contains complete information to generate traditional style
@@ -32,11 +32,11 @@
 
 	* test/ruby/test_settracefunc.rb: fix for above change.
 
-	* vm_method.c (rb_method_defined_by): added.  This function 
+	* vm_method.c (rb_method_defined_by): added.  This function
 	  checks that the given object responds with the given method
 	  by the given cfunc.
 
-	* benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb: 
+	* benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb:
 	  add to measure exception creation speed. raise1 create
 	  exception objects from shallow stack frame.  raise2 create
 	  exception objects from deep stack frame.
@@ -343,7 +343,7 @@
 Wed May 16 15:44:22 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* configure.in: Fix an unbalanced quote.
- 
+
 Wed May 16 15:43:10 2012  NAKAMURA Usaku  <usa@r...>
 
 	* ext/extmk.rb (exts.mk): use double quotes instead of single quotes
@@ -567,7 +567,7 @@
 
 Wed May  9 04:31:26 2012  Masatoshi SEKI  <m_seki@m...>
 
-	* lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary 
+	* lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary
 	  hungs forever. [ruby-talk:395364]
 
 Tue May  8 21:09:00 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
@@ -742,7 +742,7 @@
 
 Mon May 07 09:14:11 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
-	* ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add 
+	* ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add
 	  SSLContext#version to inspect the version that was negotiated for
 	  a given connection.
 	* ext/openssl/extconf.rb: detect TLS 1.1 & 1.2 support.
Index: vm.c
===================================================================
--- vm.c	(revision 35770)
+++ vm.c	(revision 35771)
@@ -897,7 +897,7 @@
     start_cfp = RUBY_VM_NEXT_CONTROL_FRAME(
 	RUBY_VM_NEXT_CONTROL_FRAME(
 	    RUBY_VM_NEXT_CONTROL_FRAME(start_cfp))); /* skip top frames */
-    size = (start_cfp - last_cfp) + 1;
+    size = (int)(start_cfp - last_cfp) + 1;	     /* TODO: check overflow */
 
     if (n <= 0) {
 	n = size + n;
@@ -1024,7 +1024,7 @@
     int line_no = 0;
 
     if (n <= 0) {
-	n = cfp - limit_cfp;
+	n = (int)(cfp - limit_cfp); /* TODO: check overflow */
     }
 
     cfp -= 2;

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