Browse Source

Reworked GenerateEnumItemFromMacro so enum items have namespaces.

pull/787/head
Joao Matos 8 years ago
parent
commit
c7771cc677
  1. 7
      src/Generator/Library.cs

7
src/Generator/Library.cs

@ -87,14 +87,15 @@ namespace CppSharp
return null; return null;
} }
public static Enumeration.Item GenerateEnumItemFromMacro(this ASTContext context, public static Enumeration.Item GenerateEnumItemFromMacro(this Enumeration @enum,
MacroDefinition macro) MacroDefinition macro)
{ {
var item = new Enumeration.Item var item = new Enumeration.Item
{ {
Name = macro.Name, Name = macro.Name,
Expression = macro.Expression, Expression = macro.Expression,
Value = ParseMacroExpression(macro.Expression) Value = ParseMacroExpression(macro.Expression),
Namespace = @enum
}; };
return item; return item;
@ -143,7 +144,7 @@ namespace CppSharp
if (@enum.Items.Exists(it => it.Name == macro.Name)) if (@enum.Items.Exists(it => it.Name == macro.Name))
continue; continue;
var item = GenerateEnumItemFromMacro(context, macro); var item = @enum.GenerateEnumItemFromMacro(macro);
@enum.AddItem(item); @enum.AddItem(item);
macro.Enumeration = @enum; macro.Enumeration = @enum;

Loading…
Cancel
Save