From cc4275f7a9bafbf449fea19b4ec25a769d76470a Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sun, 10 Nov 2013 01:45:38 +0200 Subject: [PATCH] Generated comments, if any, for properties. Fixed a possible crash with the multiple inheritance. Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 1 + src/Generator/Passes/MultipleInheritancePass.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 1fdd75c1..1b557d5c 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -1071,6 +1071,7 @@ namespace CppSharp.Generators.CSharp if (prop.Parameters.Count > 0 && prop.Type.IsPointerToPrimitiveType()) type = ((PointerType) prop.Type).Pointee; + GenerateDeclarationCommon(prop); if (prop.ExplicitInterfaceImpl == null) { Write(Helpers.GetAccess(prop.Access)); diff --git a/src/Generator/Passes/MultipleInheritancePass.cs b/src/Generator/Passes/MultipleInheritancePass.cs index 03ac85a8..1475a629 100644 --- a/src/Generator/Passes/MultipleInheritancePass.cs +++ b/src/Generator/Passes/MultipleInheritancePass.cs @@ -82,7 +82,7 @@ namespace CppSharp.Passes instance.Namespace = @interface; instance.Name = Helpers.InstanceIdentifier; instance.QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.IntPtr)); - instance.GetMethod = new Method(); + instance.GetMethod = new Method { Namespace = @interface }; @interface.Properties.Add(instance); }