From 0f8977ec912d31c85828d81f4a959790cce6b965 Mon Sep 17 00:00:00 2001 From: Tom Spilman Date: Fri, 8 Aug 2014 17:55:58 -0500 Subject: [PATCH] Fixed a couple of places where privates that need to be generated were being filtered. --- src/Generator/AST/Utils.cs | 2 +- src/Generator/Passes/CheckIgnoredDecls.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Generator/AST/Utils.cs b/src/Generator/AST/Utils.cs index 12fffbe4..285fa708 100644 --- a/src/Generator/AST/Utils.cs +++ b/src/Generator/AST/Utils.cs @@ -36,7 +36,7 @@ namespace CppSharp.AST if (method.OperatorKind == CXXOperatorKind.Equal) return true; - if (method.Access == AccessSpecifier.Private && !method.IsOverride) + if (method.Access == AccessSpecifier.Private && !method.IsOverride && !method.IsExplicitlyGenerated) return true; //Ignore copy constructor if a base class don't has or has a private copy constructor diff --git a/src/Generator/Passes/CheckIgnoredDecls.cs b/src/Generator/Passes/CheckIgnoredDecls.cs index c5642840..a23a70be 100644 --- a/src/Generator/Passes/CheckIgnoredDecls.cs +++ b/src/Generator/Passes/CheckIgnoredDecls.cs @@ -23,7 +23,7 @@ namespace CppSharp.Passes case AccessSpecifier.Private: var method = decl as Method; var isOverride = method != null && method.IsOverride; - return generateNonPublicDecls && isOverride; + return generateNonPublicDecls && (isOverride || decl.IsExplicitlyGenerated); } return true;