summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cpp/Gen.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-05-25 10:41:30 -0700
committerMark Spruiell <mes@zeroc.com>2010-05-25 10:41:30 -0700
commitff15aebd76de59b3ac8d34ecccaf3cbe4a5df01b (patch)
tree3fd2921fac9acf7751b390401767bb587dacab89 /cpp/src/slice2cpp/Gen.cpp
parentupdating CHANGES for bug 4723 (diff)
downloadice-ff15aebd76de59b3ac8d34ecccaf3cbe4a5df01b.tar.bz2
ice-ff15aebd76de59b3ac8d34ecccaf3cbe4a5df01b.tar.xz
ice-ff15aebd76de59b3ac8d34ecccaf3cbe4a5df01b.zip
bug 4758 - bogus C++ streaming code for nested types
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 02c01bcaf13..9442aea8675 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -6631,7 +6631,9 @@ Slice::Gen::StreamVisitor::StreamVisitor(Output& h, Output& c) :
bool
Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
{
- if(m->structs().empty() && m->enums().empty() && m->exceptions().empty())
+ if(!m->hasNonLocalContained(Contained::ContainedTypeStruct) &&
+ !m->hasNonLocalContained(Contained::ContainedTypeEnum) &&
+ !m->hasNonLocalContained(Contained::ContainedTypeException))
{
return false;
}