diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 0008a0d8..68524b07 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -61,10 +61,7 @@ namespace CppSharp.Generators.CSharp return "Winapi"; } - public static string InstanceIdentifier - { - get { return Generator.GeneratedIdentifier("Instance"); } - } + public const string InstanceIdentifier = "__Instance"; public static string GetAccess(AccessSpecifier accessSpecifier) { diff --git a/src/Generator/Passes/CheckIgnoredDecls.cs b/src/Generator/Passes/CheckIgnoredDecls.cs index 6e696ce8..f300d555 100644 --- a/src/Generator/Passes/CheckIgnoredDecls.cs +++ b/src/Generator/Passes/CheckIgnoredDecls.cs @@ -14,6 +14,9 @@ namespace CppSharp.Passes case AccessSpecifier.Public: return true; case AccessSpecifier.Protected: + var @class = decl.Namespace as Class; + if (@class != null && @class.IsValueType) + return false; return generateNonPublicDecls; case AccessSpecifier.Private: var method = decl as Method;