From 451278cb107c70065cc439248a4a2637baf9a2c7 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sat, 27 Jun 2015 02:31:44 +0300 Subject: [PATCH] Removed the option for abstract impls thus enabling them by default. Signed-off-by: Dimitar Dobrev --- src/Generator/Driver.cs | 3 +-- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 6 +++--- src/Generator/Options.cs | 1 - tests/Basic/Basic.cs | 1 - tests/CSharpTemp/CSharpTemp.cs | 1 - tests/TypeMaps/TypeMaps.cs | 1 - tests/VTables/VTables.cs | 1 - 7 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs index 0082bdef..c8aa4c22 100644 --- a/src/Generator/Driver.cs +++ b/src/Generator/Driver.cs @@ -274,8 +274,7 @@ namespace CppSharp TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass()); } - if (Options.GenerateVirtualTables) - TranslationUnitPasses.AddPass(new CheckVTableComponentsPass()); + TranslationUnitPasses.AddPass(new CheckVTableComponentsPass()); if (Options.GenerateProperties) TranslationUnitPasses.AddPass(new GetterSetterToPropertyPass()); diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 79297905..dd72864d 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -407,7 +407,7 @@ namespace CppSharp.Generators.CSharp GenerateClassVariables(@class); GenerateClassProperties(@class); - if (Options.GenerateVirtualTables && @class.IsDynamic) + if (@class.IsDynamic) GenerateVTable(@class); } exit: @@ -498,7 +498,7 @@ namespace CppSharp.Generators.CSharp GenerateClassFields(@class, GenerateClassInternalsField, true); if (@class.IsGenerated) { - if (Options.GenerateVirtualTables && @class.IsDynamic) + if (@class.IsDynamic) GenerateVTablePointers(@class); var functions = GatherClassInternalFunctions(@class); @@ -1405,7 +1405,7 @@ namespace CppSharp.Generators.CSharp private void GenerateVTableClassSetupCall(Class @class, bool addPointerGuard = false) { var entries = GetUniqueVTableMethodEntries(@class); - if (Options.GenerateVirtualTables && @class.IsDynamic && entries.Count != 0) + if (@class.IsDynamic && entries.Count != 0) { // called from internal ctors which may have been passed an IntPtr.Zero if (addPointerGuard) diff --git a/src/Generator/Options.cs b/src/Generator/Options.cs index f0d6c30d..e26eb1e0 100644 --- a/src/Generator/Options.cs +++ b/src/Generator/Options.cs @@ -92,7 +92,6 @@ namespace CppSharp public bool GenerateLibraryNamespace; public bool GenerateFunctionTemplates; public bool GeneratePartialClasses; - public bool GenerateVirtualTables; public bool GenerateInterfacesForMultipleInheritance; public bool GenerateInternalImports; public bool GenerateClassMarshals; diff --git a/tests/Basic/Basic.cs b/tests/Basic/Basic.cs index 3f77d43f..269386a7 100644 --- a/tests/Basic/Basic.cs +++ b/tests/Basic/Basic.cs @@ -22,7 +22,6 @@ namespace CppSharp.Tests public override void SetupPasses(Driver driver) { - driver.Options.GenerateVirtualTables = true; driver.Options.GenerateCopyConstructors = true; driver.Options.MarshalCharAsManagedChar = true; driver.Options.GenerateProperties = true; diff --git a/tests/CSharpTemp/CSharpTemp.cs b/tests/CSharpTemp/CSharpTemp.cs index 93e978af..586e6502 100644 --- a/tests/CSharpTemp/CSharpTemp.cs +++ b/tests/CSharpTemp/CSharpTemp.cs @@ -108,7 +108,6 @@ namespace CppSharp.Tests { driver.Options.GenerateInterfacesForMultipleInheritance = true; driver.Options.GeneratePropertiesAdvanced = true; - driver.Options.GenerateVirtualTables = true; driver.Options.GenerateCopyConstructors = true; // To ensure that calls to constructors in conversion operators // are not ambiguous with multiple inheritance pass enabled. diff --git a/tests/TypeMaps/TypeMaps.cs b/tests/TypeMaps/TypeMaps.cs index bd2822b2..9f39bf51 100644 --- a/tests/TypeMaps/TypeMaps.cs +++ b/tests/TypeMaps/TypeMaps.cs @@ -15,7 +15,6 @@ namespace CppSharp.Tests public override void SetupPasses(Driver driver) { - driver.Options.GenerateVirtualTables = true; driver.Options.GenerateCopyConstructors = true; driver.Options.MarshalCharAsManagedChar = true; driver.Options.GenerateProperties = true; diff --git a/tests/VTables/VTables.cs b/tests/VTables/VTables.cs index a07d58e1..a54fd7df 100644 --- a/tests/VTables/VTables.cs +++ b/tests/VTables/VTables.cs @@ -14,7 +14,6 @@ namespace CppSharp.Tests public override void SetupPasses(Driver driver) { - driver.Options.GenerateVirtualTables = true; driver.TranslationUnitPasses.RenameDeclsUpperCase(RenameTargets.Any); driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass()); }