From 6edfe6599eacbfe8bc7963add689779014064af0 Mon Sep 17 00:00:00 2001 From: triton Date: Thu, 23 Jan 2014 17:01:22 +0000 Subject: [PATCH] Fixed generation regression leading to unnecessary access specifiers in some cases. This was introduced in PR151 (Field properties). --- src/Generator/Generators/CLI/CLIHeadersTemplate.cs | 7 ++++++- src/Generator/Generators/CLI/CLITextTemplate.cs | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs index b7bff611..afa2c060 100644 --- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs +++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs @@ -270,9 +270,14 @@ namespace CppSharp.Generators.CLI if (@class.Fields.Any()) { + PushBlock(CLIBlockKind.AccessSpecifier); NewLine(); WriteLine("private:"); - GenerateClassFields(@class); + PopBlock(NewLineKind.IfNotEmpty); + + PushBlock(CLIBlockKind.Fields); + GenerateClassFields(@class); + PopBlock(); } WriteLine("};"); diff --git a/src/Generator/Generators/CLI/CLITextTemplate.cs b/src/Generator/Generators/CLI/CLITextTemplate.cs index e0c5c35f..254711a9 100644 --- a/src/Generator/Generators/CLI/CLITextTemplate.cs +++ b/src/Generator/Generators/CLI/CLITextTemplate.cs @@ -45,6 +45,8 @@ namespace CppSharp.Generators.CLI public const int Template = BlockKind.LAST + 16; public static int Destructor = BlockKind.LAST + 17; public static int Finalizer = BlockKind.LAST + 18; + public static int AccessSpecifier = BlockKind.LAST + 19; + public static int Fields = BlockKind.LAST + 20; } ///