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

ruby-changes:67090

From: Nobuyoshi <ko1@a...>
Date: Mon, 9 Aug 2021 17:37:02 +0900 (JST)
Subject: [ruby-changes:67090] 93ddff4802 (master): Rename rb_iterate to get rid of name clash on Sun C

https://git.ruby-lang.org/ruby.git/commit/?id=93ddff4802

From 93ddff48022b75f99f540a8c1cc094a9976ca0e4 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 9 Aug 2021 17:36:00 +0900
Subject: Rename rb_iterate to get rid of name clash on Sun C

---
 include/ruby/backward/cxxanyargs.hpp | 4 ++--
 include/ruby/internal/iterator.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp
index 57f4753..92b0a68 100644
--- a/include/ruby/backward/cxxanyargs.hpp
+++ b/include/ruby/backward/cxxanyargs.hpp
@@ -205,7 +205,7 @@ inline VALUE https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/cxxanyargs.hpp#L205
 rb_iterate(onearg_type *q, VALUE w, type *e, VALUE r)
 {
     rb_block_call_func_t t = reinterpret_cast<rb_block_call_func_t>(e);
-    return backward::rb_iterate(q, w, t, r);
+    return backward::rb_iterate_deprecated(q, w, t, r);
 }
 
 #ifdef HAVE_NULLPTR
@@ -213,7 +213,7 @@ RUBY_CXX_DEPRECATED("by rb_block_call since 1.9") https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/cxxanyargs.hpp#L213
 inline VALUE
 rb_iterate(onearg_type *q, VALUE w, std::nullptr_t e, VALUE r)
 {
-    return backward::rb_iterate(q, w, e, r);
+    return backward::rb_iterate_deprecated(q, w, e, r);
 }
 #endif
 
diff --git a/include/ruby/internal/iterator.h b/include/ruby/internal/iterator.h
index e5d0d9b..720262f 100644
--- a/include/ruby/internal/iterator.h
+++ b/include/ruby/internal/iterator.h
@@ -48,7 +48,7 @@ VALUE rb_iterate(VALUE(*)(VALUE),VALUE,rb_block_call_func_t,VALUE); https://github.com/ruby/ruby/blob/trunk/include/ruby/internal/iterator.h#L48
 #ifdef __cplusplus
 namespace ruby {namespace backward {
 static inline VALUE
-rb_iterate(VALUE (*iter)(VALUE), VALUE data1, rb_block_call_func_t bl, VALUE data2)
+rb_iterate_deprecated(VALUE (*iter)(VALUE), VALUE data1, rb_block_call_func_t bl, VALUE data2)
 {
     return ::rb_iterate(iter, data1, bl, data2);
 }}}
-- 
cgit v1.1


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

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