diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-08-09 17:36:00 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-08-09 17:36:21 +0900 |
| commit | 93ddff48022b75f99f540a8c1cc094a9976ca0e4 (patch) | |
| tree | 51466c88e1dd3db7ca52b4ad946d8825e17f7556 | |
| parent | 6f6a84f2f3e82f9554618f080f9b66ded52884cc (diff) | |
Rename rb_iterate to get rid of name clash on Sun C
| -rw-r--r-- | include/ruby/backward/cxxanyargs.hpp | 4 | ||||
| -rw-r--r-- | 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 57f4753d31..92b0a68bcc 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -205,7 +205,7 @@ inline VALUE 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") 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 e5d0d9b4b1..720262f146 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); #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); }}} |