diff options
| author | Joe George <joe@zeroc.com> | 2015-12-23 14:48:40 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-24 10:01:11 -0500 |
| commit | e84da5f580821cae8dab292e19cc1296c07a8ed5 (patch) | |
| tree | 1e8783c55c7dccd5adda2b87b47b8a7c118a1147 /cpp/src/Slice/ObjCUtil.cpp | |
| parent | Fixes related to EnableSharedFromThis (diff) | |
| download | ice-e84da5f580821cae8dab292e19cc1296c07a8ed5.tar.bz2 ice-e84da5f580821cae8dab292e19cc1296c07a8ed5.tar.xz ice-e84da5f580821cae8dab292e19cc1296c07a8ed5.zip | |
ICE-6898 - "Delegate" functions for ACM callbacks
- Add delegate local interfaces CloseCallback and HeartbeatCallback and
remove ConnectionCallback.
- Replace setCallback by setCloseCallback and setHeartbeatCallback
Diffstat (limited to 'cpp/src/Slice/ObjCUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/ObjCUtil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp index 5655b34139e..77a4a9af86c 100644 --- a/cpp/src/Slice/ObjCUtil.cpp +++ b/cpp/src/Slice/ObjCUtil.cpp @@ -488,7 +488,7 @@ Slice::ObjCGenerator::mapsToPointerType(const TypePtr& type) ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); if(cl && cl->isInterface()) { - if(cl->isLocal()) + if(cl->isLocal() || (cl->definition() && cl->definition()->isDelegate())) { return false; } |