From 3fb3c4840a2ccd23a1457fad36633b8f67f1e735 Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Wed, 15 Feb 2017 23:49:44 +0000
Subject: [PATCH] Move class handling code from CSharpSources.VisitDeclContext
 to VisitClass.

---
 .../Generators/CSharp/CSharpSources.cs        | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index 281e671c..2d27f2f3 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -235,28 +235,9 @@ namespace CppSharp.Generators.CSharp
             }
 
             // Generate all the struct/class declarations.
-            foreach (var @class in context.Classes.Where(c => !c.IsIncomplete))
+            foreach (var @class in context.Classes)
             {
-                if (@class.IsInterface)
-                {
-                    GenerateInterface(@class);
-                    continue;
-                }
-
-                var specialization = @class as ClassTemplateSpecialization;
-                if (specialization != null &&
-                    specialization.SpecializationKind ==
-                        TemplateSpecializationKind.ExplicitInstantiationDeclaration)
-                    continue;
-
-                if (!@class.IsDependent)
-                {
-                    @class.Visit(this);
-                    continue;
-                }
-
-                if (!(@class.Namespace is Class))
-                    GenerateClassTemplateSpecializationInternal(@class);
+                @class.Visit(this);
             }
 
             if (context.Functions.Any(f => f.IsGenerated) ||
@@ -438,8 +419,27 @@ namespace CppSharp.Generators.CSharp
             if (@class.IsIncomplete)
                 return false;
 
-            foreach (var nestedTemplate in @class.Classes.Where(c => !c.IsIncomplete && c.IsDependent))
-                GenerateClassTemplateSpecializationInternal(nestedTemplate);
+            if (@class.IsInterface)
+            {
+                GenerateInterface(@class);
+                return true;
+            }
+
+            var specialization = @class as ClassTemplateSpecialization;
+            if (specialization != null && specialization.SpecializationKind ==
+                TemplateSpecializationKind.ExplicitInstantiationDeclaration)
+                return true;
+
+            if (@class.IsDependent)
+            {
+                foreach (var nestedTemplate in @class.Classes.Where(c => !c.IsIncomplete && c.IsDependent))
+                    GenerateClassTemplateSpecializationInternal(nestedTemplate);
+
+                if (!(@class.Namespace is Class))
+                    GenerateClassTemplateSpecializationInternal(@class);
+
+                return true;
+            }
 
             System.Type typeMap = null;
             string key = string.Empty;