summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-02-23 13:40:38 -0330
committerDwayne Boone <dwayne@zeroc.com>2009-02-23 13:40:38 -0330
commit68bea2fb3f0fd8f48e63caec75038c2ee01ffa0e (patch)
tree2bb57b680a1a55ef1456c13858c783de67b51e99 /cpp/src
parentBug 3740 - issue warning for improper protobuf usage (diff)
downloadice-68bea2fb3f0fd8f48e63caec75038c2ee01ffa0e.tar.bz2
ice-68bea2fb3f0fd8f48e63caec75038c2ee01ffa0e.tar.xz
ice-68bea2fb3f0fd8f48e63caec75038c2ee01ffa0e.zip
Fixed null reference on windows
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 5eae2adf2e0..1e40c9fcfa8 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1126,7 +1126,7 @@ Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p)
{
string name = fixKwd(p->name());
TypePtr type = p->type();
- if(StructPtr::dynamicCast(p->container()) || ExceptionPtr::dynamicCast(p->container()) &&
+ if(p->container() != 0 && (StructPtr::dynamicCast(p->container()) || ExceptionPtr::dynamicCast(p->container())) &&
SequencePtr::dynamicCast(type))
{
SequencePtr s = SequencePtr::dynamicCast(type);