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

ruby-changes:65182

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Feb 2021 23:38:10 +0900 (JST)
Subject: [ruby-changes:65182] 1499f626a5 (master): [DOC] Modified prefixes to get rid of conflicts

https://git.ruby-lang.org/ruby.git/commit/?id=1499f626a5

From 1499f626a55fff59ccfa51dc2924ebfe7c6ded82 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 7 Feb 2021 23:35:06 +0900
Subject: [DOC] Modified prefixes to get rid of conflicts

---
 object.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/object.c b/object.c
index 13066b1..8e4c89b 100644
--- a/object.c
+++ b/object.c
@@ -931,7 +931,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L931
  *    New subclass: Bar
  *    New subclass: Baz
  */
-#define rb_class_inherited rb_obj_dummy1
+#define rb_obj_class_inherited rb_obj_dummy1
 
 /* Document-method: method_added
  *
@@ -954,7 +954,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L954
  *   Adding :some_instance_method
  *
  */
-#define rb_mod_method_added rb_obj_dummy1
+#define rb_obj_mod_method_added rb_obj_dummy1
 
 /* Document-method: method_removed
  *
@@ -981,7 +981,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L981
  *   Removing :some_instance_method
  *
  */
-#define rb_mod_method_removed rb_obj_dummy1
+#define rb_obj_mod_method_removed rb_obj_dummy1
 
 /* Document-method: method_undefined
  *
@@ -1008,7 +1008,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L1008
  *   Undefining :some_instance_method
  *
  */
-#define rb_mod_method_undefined rb_obj_dummy1
+#define rb_obj_mod_method_undefined rb_obj_dummy1
 
 /*
  * Document-method: singleton_method_added
@@ -1109,7 +1109,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L1109
  *        end
  *         # => prints "A extended in Enumerable"
  */
-#define rb_mod_extended rb_obj_dummy1
+#define rb_obj_mod_extended rb_obj_dummy1
 
 /*
  * Document-method: included
@@ -1132,7 +1132,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L1132
  *        end
  *         # => prints "A included in Enumerable"
  */
-#define rb_mod_included rb_obj_dummy1
+#define rb_obj_mod_included rb_obj_dummy1
 
 /*
  * Document-method: prepended
@@ -1152,7 +1152,7 @@ rb_class_search_ancestor(VALUE cl, VALUE c) https://github.com/ruby/ruby/blob/trunk/object.c#L1152
  *        end
  *         # => prints "A prepended to Enumerable"
  */
-#define rb_mod_prepended rb_obj_dummy1
+#define rb_obj_mod_prepended rb_obj_dummy1
 
 /*
  * Document-method: initialize
@@ -4559,13 +4559,13 @@ InitVM_Object(void) https://github.com/ruby/ruby/blob/trunk/object.c#L4559
      */
     rb_mKernel = rb_define_module("Kernel");
     rb_include_module(rb_cObject, rb_mKernel);
-    rb_define_private_method(rb_cClass, "inherited", rb_class_inherited, 1);
-    rb_define_private_method(rb_cModule, "included", rb_mod_included, 1);
-    rb_define_private_method(rb_cModule, "extended", rb_mod_extended, 1);
-    rb_define_private_method(rb_cModule, "prepended", rb_mod_prepended, 1);
-    rb_define_private_method(rb_cModule, "method_added", rb_mod_method_added, 1);
-    rb_define_private_method(rb_cModule, "method_removed", rb_mod_method_removed, 1);
-    rb_define_private_method(rb_cModule, "method_undefined", rb_mod_method_undefined, 1);
+    rb_define_private_method(rb_cClass, "inherited", rb_obj_class_inherited, 1);
+    rb_define_private_method(rb_cModule, "included", rb_obj_mod_included, 1);
+    rb_define_private_method(rb_cModule, "extended", rb_obj_mod_extended, 1);
+    rb_define_private_method(rb_cModule, "prepended", rb_obj_mod_prepended, 1);
+    rb_define_private_method(rb_cModule, "method_added", rb_obj_mod_method_added, 1);
+    rb_define_private_method(rb_cModule, "method_removed", rb_obj_mod_method_removed, 1);
+    rb_define_private_method(rb_cModule, "method_undefined", rb_obj_mod_method_undefined, 1);
 
     rb_define_method(rb_mKernel, "nil?", rb_false, 0);
     rb_define_method(rb_mKernel, "===", case_equal, 1);
-- 
cgit v1.1


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

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