diff --git a/src/AST/Class.cs b/src/AST/Class.cs index 88065f73..61b85219 100644 --- a/src/AST/Class.cs +++ b/src/AST/Class.cs @@ -149,7 +149,7 @@ namespace CppSharp.AST { foreach (var @base in Bases) { - if (@base.IsClass && !@base.Class.Ignore) + if (@base.IsClass && !@base.Class.ExplicityIgnored) return @base.Class; } diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs index 64c93e0c..5197c7f9 100644 --- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs +++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs @@ -68,7 +68,7 @@ namespace CppSharp.Generators.CLI var include = typeRef.Include; var unit = include.TranslationUnit; - if (unit != null && unit.Ignore) + if (unit != null && unit.ExplicityIgnored) continue; if(!string.IsNullOrEmpty(include.File) && include.InHeader) diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 7c75378a..56dbe99c 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -652,7 +652,7 @@ namespace CppSharp.Generators.CLI private bool GenerateClassConstructorBase(Class @class, bool isIntPtr, Method method = null) { - var hasBase = @class.HasBase && @class.Bases[0].IsClass && !@class.Bases[0].Class.Ignore; + var hasBase = @class.HasBase && @class.Bases[0].IsClass && !@class.Bases[0].Class.ExplicityIgnored; if (!hasBase) return false; diff --git a/src/Generator/Generators/CLI/CLITypeReferences.cs b/src/Generator/Generators/CLI/CLITypeReferences.cs index 90129523..059792df 100644 --- a/src/Generator/Generators/CLI/CLITypeReferences.cs +++ b/src/Generator/Generators/CLI/CLITypeReferences.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using CppSharp.AST; using CppSharp.AST.Extensions; using CppSharp.Generators.AST; @@ -111,7 +112,7 @@ namespace CppSharp.Generators.CLI if(decl.Namespace.TranslationUnit.IsSystemHeader) return; - if(decl.Ignore) + if(decl.ExplicityIgnored) return; if(IsBuiltinTypedef(decl)) @@ -157,7 +158,7 @@ namespace CppSharp.Generators.CLI if (decl.Namespace != null && decl.Namespace.TranslationUnit.IsSystemHeader) return false; - return !decl.Ignore; + return !decl.ExplicityIgnored; } public override bool VisitClassDecl(Class @class) diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 7d4f5ad8..91034421 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -710,7 +710,7 @@ namespace CppSharp.Generators.CSharp baseClass = @class.Bases[0].Class; var hasRefBase = baseClass != null && baseClass.IsRefType - && !baseClass.Ignore; + && !baseClass.ExplicityIgnored; return hasRefBase; }