Browse Source

Fixed generation regression leading to unnecessary access specifiers in some cases.

This was introduced in PR151 (Field properties).
pull/155/head
triton 12 years ago
parent
commit
6edfe6599e
  1. 5
      src/Generator/Generators/CLI/CLIHeadersTemplate.cs
  2. 2
      src/Generator/Generators/CLI/CLITextTemplate.cs

5
src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@ -270,9 +270,14 @@ namespace CppSharp.Generators.CLI
if (@class.Fields.Any()) if (@class.Fields.Any())
{ {
PushBlock(CLIBlockKind.AccessSpecifier);
NewLine(); NewLine();
WriteLine("private:"); WriteLine("private:");
PopBlock(NewLineKind.IfNotEmpty);
PushBlock(CLIBlockKind.Fields);
GenerateClassFields(@class); GenerateClassFields(@class);
PopBlock();
} }
WriteLine("};"); WriteLine("};");

2
src/Generator/Generators/CLI/CLITextTemplate.cs

@ -45,6 +45,8 @@ namespace CppSharp.Generators.CLI
public const int Template = BlockKind.LAST + 16; public const int Template = BlockKind.LAST + 16;
public static int Destructor = BlockKind.LAST + 17; public static int Destructor = BlockKind.LAST + 17;
public static int Finalizer = BlockKind.LAST + 18; public static int Finalizer = BlockKind.LAST + 18;
public static int AccessSpecifier = BlockKind.LAST + 19;
public static int Fields = BlockKind.LAST + 20;
} }
/// <summary> /// <summary>

Loading…
Cancel
Save