diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/src/Ice/Proxy.cpp | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index f2e20d3ee50..69da155dd9d 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -70,6 +70,26 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& return 0; } +#ifdef ICE_CPP11 +void +IceInternal::Cpp11FnOnewayCallbackNC::__completed(const ::Ice::AsyncResultPtr& result) const +{ + try + { + result->getProxy()->__end(result, result->getOperation()); + } + catch(const ::Ice::Exception& ex) + { + Cpp11FnCallbackNC::__exception(result, ex); + return; + } + if(_cb != nullptr) + { + _cb(); + } +} +#endif + bool IceProxy::Ice::Object::operator==(const Object& r) const { |