summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-14 09:44:57 -0500
committerJoe George <joe@zeroc.com>2015-12-14 09:44:57 -0500
commit2a1244556eb7de16f719f63d0189dc505cac3174 (patch)
tree8d1485d0407da135a0550fd7fd55bce5a15dc120
parentC++11 mapping, binding/checksum/defaultServant tests (diff)
downloadice-2a1244556eb7de16f719f63d0189dc505cac3174.tar.bz2
ice-2a1244556eb7de16f719f63d0189dc505cac3174.tar.xz
ice-2a1244556eb7de16f719f63d0189dc505cac3174.zip
Fix ICE-6923 - slice2objc crash when type is Value
-rw-r--r--cpp/src/Slice/ObjCUtil.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp
index 2f2f39c1c61..cb156ea50be 100644
--- a/cpp/src/Slice/ObjCUtil.cpp
+++ b/cpp/src/Slice/ObjCUtil.cpp
@@ -263,7 +263,8 @@ Slice::ObjCGenerator::typeToString(const TypePtr& type)
"NSString",
"ICEObject",
"id<ICEObjectPrx>",
- "id" // Dummy--we don't support Slice local Object
+ "id", // Dummy--we don't support Slice local Object
+ "ICEObject"
};
BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);