bug 4758 - bogus C++ streaming code for nested types

1 files changed, 20 insertions, 0 deletions

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index c1e27516176..5711c7b77b1 100755
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1779,6 +1779,26 @@ Slice::Container::hasAsyncOps() const
     return false;
 }
 
+bool
+Slice::Container::hasNonLocalContained(Contained::ContainedType type) const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        if((*p)->containedType() == type)
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasNonLocalContained(type))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 string
 Slice::Container::thisScope() const
 {