kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Rename rb_iterate to get rid of name clash on Sun C

Browse source
This commit is contained in:
Nobuyoshi Nakada 2021-08-09 17:36:00 +09:00
parent 6f6a84f2f3
commit 93ddff4802
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/ruby/backward/cxxanyargs.hpp
View file

@ -205,7 +205,7 @@ inline VALUE
rb_iterate(onearg_type *q, VALUE w, type *e, VALUE r) 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); 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 #ifdef HAVE_NULLPTR
@ -213,7 +213,7 @@ RUBY_CXX_DEPRECATED("by rb_block_call since 1.9")
inline VALUE inline VALUE
rb_iterate(onearg_type *q, VALUE w, std::nullptr_t e, VALUE r) 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 #endif

2
include/ruby/internal/iterator.h
View file

@ -48,7 +48,7 @@ VALUE rb_iterate(VALUE(*)(VALUE),VALUE,rb_block_call_func_t,VALUE);
#ifdef __cplusplus #ifdef __cplusplus
namespace ruby {namespace backward { namespace ruby {namespace backward {
static inline VALUE 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); return ::rb_iterate(iter, data1, bl, data2);
}}} }}}