[前][次][番号順一覧][スレッド一覧]

ruby-changes:45438

From: nobu <ko1@a...>
Date: Fri, 3 Feb 2017 15:48:09 +0900 (JST)
Subject: [ruby-changes:45438] nobu:r57511 (trunk): ensured.c: fix conflict

nobu	2017-02-03 15:48:02 +0900 (Fri, 03 Feb 2017)

  New Revision: 57511

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57511

  Log:
    ensured.c: fix conflict
    
    * ext/-test-/exception/ensured.c (exc_raise): get rid of conflict
      with raise(2) in the standard.  [ruby-core:79371] [Bug #13176]

  Modified files:
    trunk/ext/-test-/exception/ensured.c
Index: ext/-test-/exception/ensured.c
===================================================================
--- ext/-test-/exception/ensured.c	(revision 57510)
+++ ext/-test-/exception/ensured.c	(revision 57511)
@@ -19,7 +19,7 @@ ensured(VALUE module, VALUE object) https://github.com/ruby/ruby/blob/trunk/ext/-test-/exception/ensured.c#L19
 }
 
 static VALUE
-raise(VALUE exc)
+exc_raise(VALUE exc)
 {
     rb_exc_raise(exc);
     return Qnil;
@@ -28,7 +28,7 @@ raise(VALUE exc) https://github.com/ruby/ruby/blob/trunk/ext/-test-/exception/ensured.c#L28
 static VALUE
 ensure_raise(VALUE module, VALUE object, VALUE exc)
 {
-    return rb_ensure(rb_yield, object, raise, exc);
+    return rb_ensure(rb_yield, object, exc_raise, exc);
 }
 
 void

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

[前][次][番号順一覧][スレッド一覧]