summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cs
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-01-28 00:30:36 +0100
committerJose <jose@zeroc.com>2017-01-28 00:30:36 +0100
commit2b50eb7e8a5965d721f99ff6b51ad77c82df6a71 (patch)
tree1c1b1e832a5eaac5501f642a0aaa4a0d6b45a9bd /cpp/src/slice2cs
parentICE-7112: add ability to start/stop all servers on a node (diff)
downloadice-2b50eb7e8a5965d721f99ff6b51ad77c82df6a71.tar.bz2
ice-2b50eb7e8a5965d721f99ff6b51ad77c82df6a71.tar.xz
ice-2b50eb7e8a5965d721f99ff6b51ad77c82df6a71.zip
slice2cs build failure
Diffstat (limited to 'cpp/src/slice2cs')
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 5372592482c..85e121c1967 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -1186,8 +1186,12 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
ProxyPtr proxy = ProxyPtr::dynamicCast(type);
- ClassDefPtr def = proxy ? proxy->_class()->definition() : ICE_NULLPTR;
- bool isObjectProxySeq = def && !def->isInterface() && def->allOperations().size() == ICE_NULLPTR;
+ ClassDefPtr clsDef;
+ if(proxy)
+ {
+ clsDef = proxy->_class()->definition();
+ }
+ bool isObjectProxySeq = clsDef && !clsDef->isInterface() && clsDef->allOperations().size() == 0;
Builtin::Kind kind = builtin ? builtin->kind() : Builtin::KindObjectProxy;
if(builtin || isObjectProxySeq)