Browse Source

Enabled multiple inheritance, and removed its option, in the C# generator.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/719/head
Dimitar Dobrev 9 years ago
parent
commit
ad5505f113
  1. 2
      src/Generator/Driver.cs
  2. 1
      src/Generator/Options.cs
  3. 1
      tests/CSharp/CSharp.cs

2
src/Generator/Driver.cs

@ -322,7 +322,7 @@ namespace CppSharp @@ -322,7 +322,7 @@ namespace CppSharp
}
}
if (Options.GenerateInterfacesForMultipleInheritance)
if (Options.IsCSharpGenerator)
{
TranslationUnitPasses.AddPass(new MultipleInheritancePass());
TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass());

1
src/Generator/Options.cs

@ -91,7 +91,6 @@ namespace CppSharp @@ -91,7 +91,6 @@ namespace CppSharp
public bool OutputInteropIncludes;
public bool GenerateFunctionTemplates;
public bool GeneratePartialClasses;
public bool GenerateInterfacesForMultipleInheritance;
public bool GenerateInternalImports;
public bool GenerateClassMarshals;
public bool GenerateInlines;

1
tests/CSharp/CSharp.cs

@ -150,7 +150,6 @@ namespace CppSharp.Tests @@ -150,7 +150,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver)
{
driver.Options.GenerateInterfacesForMultipleInheritance = true;
driver.Options.GeneratePropertiesAdvanced = true;
// To ensure that calls to constructors in conversion operators
// are not ambiguous with multiple inheritance pass enabled.

Loading…
Cancel
Save