From ad5505f113e48cd46357fb951d6b7807a94e3e1e Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 25 Oct 2016 23:47:21 +0300 Subject: [PATCH] Enabled multiple inheritance, and removed its option, in the C# generator. Signed-off-by: Dimitar Dobrev --- src/Generator/Driver.cs | 2 +- src/Generator/Options.cs | 1 - tests/CSharp/CSharp.cs | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs index 98a85aa3..f5082a47 100644 --- a/src/Generator/Driver.cs +++ b/src/Generator/Driver.cs @@ -322,7 +322,7 @@ namespace CppSharp } } - if (Options.GenerateInterfacesForMultipleInheritance) + if (Options.IsCSharpGenerator) { TranslationUnitPasses.AddPass(new MultipleInheritancePass()); TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass()); diff --git a/src/Generator/Options.cs b/src/Generator/Options.cs index d2f909bc..a78f89d9 100644 --- a/src/Generator/Options.cs +++ b/src/Generator/Options.cs @@ -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; diff --git a/tests/CSharp/CSharp.cs b/tests/CSharp/CSharp.cs index 50a695bd..e0c47210 100644 --- a/tests/CSharp/CSharp.cs +++ b/tests/CSharp/CSharp.cs @@ -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.