diff options
author | Bernard Normier <bernard@zeroc.com> | 2017-01-09 16:03:10 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2017-01-09 16:03:10 -0500 |
commit | 7c74420c53bda5789e6ab78f1e16d18486a294c6 (patch) | |
tree | 9184b09775ed29ebf3db72b64a9b95f5980e5b51 /ruby/src | |
parent | Python/Ruby build fixes (diff) | |
download | ice-7c74420c53bda5789e6ab78f1e16d18486a294c6.tar.bz2 ice-7c74420c53bda5789e6ab78f1e16d18486a294c6.tar.xz ice-7c74420c53bda5789e6ab78f1e16d18486a294c6.zip |
Renamed optional invocation context parameter in Python, Ruby and PHP
new name: context old name: _ctx
Fixed macOS build
Diffstat (limited to 'ruby/src')
-rw-r--r-- | ruby/src/IceRuby/Proxy.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ruby/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp index fd7c201f6b8..fee9df5c85d 100644 --- a/ruby/src/IceRuby/Proxy.cpp +++ b/ruby/src/IceRuby/Proxy.cpp @@ -1134,7 +1134,7 @@ IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE self) extern "C" VALUE -IceRuby_ObjectPrx_ice_checkedCast(VALUE self, VALUE obj, VALUE id, VALUE facetOrCtx, VALUE ctx) +IceRuby_ObjectPrx_ice_checkedCast(VALUE self, VALUE obj, VALUE id, VALUE facetOrContext, VALUE ctx) { // // ice_checkedCast is called from generated code, therefore we always expect @@ -1157,19 +1157,19 @@ IceRuby_ObjectPrx_ice_checkedCast(VALUE self, VALUE obj, VALUE id, VALUE facetOr string idstr = getString(id); volatile VALUE facet = Qnil; - if(isString(facetOrCtx)) + if(isString(facetOrContext)) { - facet = facetOrCtx; + facet = facetOrContext; } - else if(isHash(facetOrCtx)) + else if(isHash(facetOrContext)) { if(!NIL_P(ctx)) { throw RubyException(rb_eArgError, "facet argument to checkedCast must be a string"); } - ctx = facetOrCtx; + ctx = facetOrContext; } - else if(!NIL_P(facetOrCtx)) + else if(!NIL_P(facetOrContext)) { throw RubyException(rb_eArgError, "second argument to checkedCast must be a facet or context"); } |