diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-03-16 11:37:46 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-03-16 11:37:46 -0700 |
| commit | 473bf30951e4b711ed6829e765f2d330ce8d80db (patch) | |
| tree | 003c19faeee7dfe1dd0b3dcebaa6e1ef3fd17f47 /ruby/src/IceRuby/Proxy.cpp | |
| parent | ICE-7020 - php Ice/defaultValue failing (diff) | |
| download | ice-473bf30951e4b711ed6829e765f2d330ce8d80db.tar.bz2 ice-473bf30951e4b711ed6829e765f2d330ce8d80db.tar.xz ice-473bf30951e4b711ed6829e765f2d330ce8d80db.zip | |
ICE-7023 - Ruby 2.3 compatibility
Diffstat (limited to 'ruby/src/IceRuby/Proxy.cpp')
| -rw-r--r-- | ruby/src/IceRuby/Proxy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ruby/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp index 86da9b3e5c9..0029cad3378 100644 --- a/ruby/src/IceRuby/Proxy.cpp +++ b/ruby/src/IceRuby/Proxy.cpp @@ -188,7 +188,7 @@ IceRuby_ObjectPrx_ice_ids(int argc, VALUE* argv, VALUE self) long i = 0; for(vector<string>::iterator q = ids.begin(); q != ids.end(); ++q, ++i) { - RARRAY_PTR(result)[i] = createString(*q); + RARRAY_ASET(result, i, createString(*q)); } return result; @@ -352,7 +352,7 @@ IceRuby_ObjectPrx_ice_getEndpoints(VALUE self) long i = 0; for(Ice::EndpointSeq::iterator q = seq.begin(); q != seq.end(); ++q, ++i) { - RARRAY_PTR(result)[i] = createEndpoint(*q); + RARRAY_ASET(result, i, createEndpoint(*q)); } return result; } @@ -383,11 +383,11 @@ IceRuby_ObjectPrx_ice_endpoints(VALUE self, VALUE seq) } for(long i = 0; i < RARRAY_LEN(arr); ++i) { - if(!checkEndpoint(RARRAY_PTR(arr)[i])) + if(!checkEndpoint(RARRAY_AREF(arr, i))) { throw RubyException(rb_eTypeError, "array element is not an Ice::Endpoint"); } - Ice::EndpointPtr* e = reinterpret_cast<Ice::EndpointPtr*>(DATA_PTR(RARRAY_PTR(arr)[i])); + Ice::EndpointPtr* e = reinterpret_cast<Ice::EndpointPtr*>(DATA_PTR(RARRAY_AREF(arr, i))); assert(e); endpoints.push_back(*e); } |