Browse Source

Generated comments, if any, for properties. Fixed a possible crash with the multiple inheritance.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/115/head
Dimitar Dobrev 12 years ago
parent
commit
cc4275f7a9
  1. 1
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  2. 2
      src/Generator/Passes/MultipleInheritancePass.cs

1
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -1071,6 +1071,7 @@ namespace CppSharp.Generators.CSharp
if (prop.Parameters.Count > 0 && prop.Type.IsPointerToPrimitiveType()) if (prop.Parameters.Count > 0 && prop.Type.IsPointerToPrimitiveType())
type = ((PointerType) prop.Type).Pointee; type = ((PointerType) prop.Type).Pointee;
GenerateDeclarationCommon(prop);
if (prop.ExplicitInterfaceImpl == null) if (prop.ExplicitInterfaceImpl == null)
{ {
Write(Helpers.GetAccess(prop.Access)); Write(Helpers.GetAccess(prop.Access));

2
src/Generator/Passes/MultipleInheritancePass.cs

@ -82,7 +82,7 @@ namespace CppSharp.Passes
instance.Namespace = @interface; instance.Namespace = @interface;
instance.Name = Helpers.InstanceIdentifier; instance.Name = Helpers.InstanceIdentifier;
instance.QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.IntPtr)); instance.QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.IntPtr));
instance.GetMethod = new Method(); instance.GetMethod = new Method { Namespace = @interface };
@interface.Properties.Add(instance); @interface.Properties.Add(instance);
} }

Loading…
Cancel
Save