fixes after building babulon c# port

bernd5 · Jun 11, 2017 · e1b53e2 · e1b53e2
1 parent 9e80b7b
commit e1b53e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Il2Native.Logic/DOM2/Call.cs b/Il2Native.Logic/DOM2/Call.cs
@@ -216,7 +216,6 @@ internal override void WriteTo(CCodeWriterBase c)
                 else
                 {
                     c.WriteNamespace(this.Method.ContainingType, containingNamespace: MethodOwner?.ContainingNamespace);
-                    c.TextSpan("::");
                 }
 
                 c.WriteMethodName(this.Method, addTemplate: true, containingNamespace: MethodOwner?.ContainingNamespace);

diff --git a/Il2Native.Logic/Helpers.cs b/Il2Native.Logic/Helpers.cs
@@ -939,6 +939,13 @@ public static bool StartsWith(this INamespaceSymbol namespaceSymbol, INamespaceS
                 return false;
             }
 
+            if (namespaceSymbol.ContainingAssembly != null 
+                && otherNamespaceSymbol.ContainingAssembly != null 
+                && namespaceSymbol.ContainingAssembly.Name.CompareTo(otherNamespaceSymbol.ContainingAssembly.Name) != 0)
+            {
+                return false;
+            }
+
             var notGlobalNamespace = true;
             var parts = namespaceSymbol.EnumNamespaces().GetEnumerator();
             var partsOther = otherNamespaceSymbol.EnumNamespaces().GetEnumerator();
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,7 +216,6 @@ internal override void WriteTo(CCodeWriterBase c) @@
                     else
                     {
                         c.WriteNamespace(this.Method.ContainingType, containingNamespace: MethodOwner?.ContainingNamespace);
-                        c.TextSpan("::");
                     }
                     c.WriteMethodName(this.Method, addTemplate: true, containingNamespace: MethodOwner?.ContainingNamespace);
@@ Expand Down @@