From b6d4f0f97b932259c0f13dfa9d429317d314e529 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 3 Sep 2013 02:50:04 +0300 Subject: [PATCH] Fixed a regression caused by the returning of null. Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 83c11c47..785ba085 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -1758,8 +1758,10 @@ namespace CppSharp.Generators.CSharp if (retType.Type.IsPointer() && isIntPtr) { - WriteLine("if ({0} == global::System.IntPtr.Zero) return null;", - Generator.GeneratedIdentifier("ret")); + string @null = retType.Type.IsPrimitiveType(PrimitiveType.IntPtr) ? + "IntPtr.Zero" : "null"; + WriteLine("if ({0} == global::System.IntPtr.Zero) return {1};", + Generator.GeneratedIdentifier("ret"), @null); } var ctx = new CSharpMarshalContext(Driver)