From d49be5746789b5487a0a9296ba08cc8c4b00d972 Mon Sep 17 00:00:00 2001 From: triton Date: Fri, 24 Oct 2014 21:49:02 +0100 Subject: [PATCH] Fixed generation bug for ARM ABI. Closes #351. --- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 4 ++-- src/Generator/Options.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 89245cb9..6425fe5b 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -2848,7 +2848,7 @@ namespace CppSharp.Generators.CSharp } if (!function.HasIndirectReturnTypeParameter && - isInstanceMethod && Options.IsItaniumAbi) + isInstanceMethod && Options.IsItaniumLikeAbi) @params.Add("global::System.IntPtr instance"); foreach (var param in function.Parameters) @@ -2861,7 +2861,7 @@ namespace CppSharp.Generators.CSharp @params.Add(string.Format("{0} {1}", typeName, param.Name)); if (param.Kind == ParameterKind.IndirectReturnType && - isInstanceMethod && Options.IsItaniumAbi) + isInstanceMethod && Options.IsItaniumLikeAbi) @params.Add("global::System.IntPtr instance"); } diff --git a/src/Generator/Options.cs b/src/Generator/Options.cs index 72a0358a..6c160dc6 100644 --- a/src/Generator/Options.cs +++ b/src/Generator/Options.cs @@ -64,7 +64,7 @@ namespace CppSharp public bool IgnoreParseWarnings; public bool IgnoreParseErrors; - public bool IsItaniumAbi { get { return Abi == CppAbi.Itanium; } } + public bool IsItaniumLikeAbi { get { return Abi == CppAbi.Itanium || Abi == CppAbi.ARM; } } public bool IsMicrosoftAbi { get { return Abi == CppAbi.Microsoft; } } // Library options