diff options
| author | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
| commit | 13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch) | |
| tree | c230ae28caba40ac1f939fbedb5fd780d49fad0c /ruby/src | |
| parent | ICE-6861 - removing public stream API (diff) | |
| download | ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2 ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip | |
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'ruby/src')
| -rw-r--r-- | ruby/src/IceRuby/Types.cpp | 10 | ||||
| -rw-r--r-- | ruby/src/IceRuby/Types.h | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp index da5832c7f9a..dabbbd39858 100644 --- a/ruby/src/IceRuby/Types.cpp +++ b/ruby/src/IceRuby/Types.cpp @@ -2098,7 +2098,7 @@ namespace void patchObject(void* addr, const Ice::ObjectPtr& v) -{ +{ ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); assert(cb); cb->invoke(v); @@ -2832,19 +2832,13 @@ IceRuby::ExceptionReader::ice_id() const } #ifndef ICE_CPP11_MAPPING -string -IceRuby::ExceptionReader::ice_name() const -{ - return ice_id(); -} -#endif - Ice::UserException* IceRuby::ExceptionReader::ice_clone() const { assert(false); return 0; } +#endif void IceRuby::ExceptionReader::ice_throw() const diff --git a/ruby/src/IceRuby/Types.h b/ruby/src/IceRuby/Types.h index 091e4215229..37787c22339 100644 --- a/ruby/src/IceRuby/Types.h +++ b/ruby/src/IceRuby/Types.h @@ -544,10 +544,8 @@ public: virtual std::string ice_id() const; #ifndef ICE_CPP11_MAPPING - ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") - virtual std::string ice_name() const; -#endif virtual Ice::UserException* ice_clone() const; +#endif virtual void ice_throw() const; virtual void __write(Ice::OutputStream*) const; |