[patch] files/Ice-3.4.0-stream1.patch

Ice-3.4.0-stream1.patch (text/plain), 1.26 KB, created by Philip Kovacs on 2010-04-04 00:25:30 UTC

--- ./src/slice2cpp/Gen.cpp
+++ ./src/slice2cpp/Gen.cpp
@@ -6629,21 +6629,34 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
     {
         return false;
     }
-    H.zeroIndent();
-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
-    H << nl << "#else";
-    H.restoreIndent();
-    H << nl << "namespace Ice" << nl << '{';
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << sp;
+        H.zeroIndent();
+        H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
+        H << nl << "#else";
+        H.restoreIndent();
+        H << nl << "namespace Ice" << nl << '{';
+    }
     return true;
 }
 
 void
-Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr&)
+Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m)
 {
-    H << nl << '}';
-    H.zeroIndent();
-    H << nl << "#endif";
-    H.restoreIndent();
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << nl << '}';
+        H.zeroIndent();
+        H << nl << "#endif";
+        H.restoreIndent();
+    }
 }
 
 bool