Browse Source

Marshaling correctness fix for enum and primitive types in NAPI.

pull/1557/head
Joao Matos 5 years ago committed by João Matos
parent
commit
11cc603ee1
  1. 4
      src/Generator/Generators/NAPI/NAPIMarshal.cs

4
src/Generator/Generators/NAPI/NAPIMarshal.cs

@ -128,7 +128,7 @@ namespace CppSharp.Generators.NAPI
public bool VisitPrimitiveType(PrimitiveType primitive) public bool VisitPrimitiveType(PrimitiveType primitive)
{ {
var result = $"__result"; var result = Generator.GeneratedIdentifier(Context.ReturnVarName);
var (_, func) = GetNAPIPrimitiveType(primitive); var (_, func) = GetNAPIPrimitiveType(primitive);
switch (primitive) switch (primitive)
@ -755,7 +755,7 @@ namespace CppSharp.Generators.NAPI
public override bool VisitEnumDecl(Enumeration @enum) public override bool VisitEnumDecl(Enumeration @enum)
{ {
VisitPrimitiveType(PrimitiveType.Int); VisitPrimitiveType(@enum.BuiltinType.Type);
Context.Return.StringBuilder.Clear(); Context.Return.StringBuilder.Clear();
Context.Return.Write($"(::{@enum.QualifiedOriginalName}){Context.Parameter.Name}"); Context.Return.Write($"(::{@enum.QualifiedOriginalName}){Context.Parameter.Name}");

Loading…
Cancel
Save