Fix slice2cs bug, result struct was not always generated

1 files changed, 28 insertions, 3 deletions

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index bffe8d58049..69d6a3e8c18 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -3392,8 +3392,11 @@ Slice::Gen::ResultVisitor::ResultVisitor(::IceUtilInternal::Output& out)
 {
 }
 
+namespace
+{
+
 bool
-Slice::Gen::ResultVisitor::visitModuleStart(const ModulePtr& p)
+hasResultType(const ModulePtr& p)
 {
     ClassList classes = p->classes();
     for(ClassList::const_iterator i = classes.begin(); i != classes.end(); ++i)
@@ -3409,13 +3412,35 @@ Slice::Gen::ResultVisitor::visitModuleStart(const ModulePtr& p)
                 TypePtr ret = op->returnType();
                 if(outParams.size() > 1 || (ret && outParams.size() > 0))
                 {
-                    _out << sp << nl << "namespace " << fixId(p->name());
-                    _out << sb;
                     return true;
                 }
             }
         }
     }
+
+    ModuleList modules = p->modules();
+    for(ModuleList::const_iterator i = modules.begin(); i != modules.end(); ++i)
+    {
+        if(hasResultType(*i))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+}
+
+bool
+Slice::Gen::ResultVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(hasResultType(p))
+    {
+        _out << sp << nl << "namespace " << fixId(p->name());
+        _out << sb;
+        return true;
+    }
     return false;
 }