From 458f7ff25b719d14dd5c656cad5bf21d5f55799c Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 1 Nov 2016 16:24:46 +0200 Subject: [PATCH] Deleted the non-working marshalling interface and the option for it. Signed-off-by: Dimitar Dobrev --- .../Generators/CSharp/CSharpSources.cs | 29 ------------------- src/Generator/Options.cs | 2 -- 2 files changed, 31 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs index 6d64466d..a151d9b0 100644 --- a/src/Generator/Generators/CSharp/CSharpSources.cs +++ b/src/Generator/Generators/CSharp/CSharpSources.cs @@ -489,11 +489,6 @@ namespace CppSharp.Generators.CSharp PopBlock(NewLineKind.BeforeNextBlock); } - if (Options.GenerateClassMarshals) - { - GenerateClassMarshals(@class); - } - GenerateClassConstructors(@class); GenerateClassMethods(@class.Methods); @@ -511,25 +506,6 @@ namespace CppSharp.Generators.CSharp Context.TypeMaps.TypeMaps.Add(@class.Name, typeMap); } - private void GenerateClassMarshals(Class @class) - { - WriteLine("int CppSharp.Runtime.ICppMarshal.NativeDataSize"); - WriteStartBraceIndent(); - WriteLine("get {{ return {0}; }}", @class.Layout.DataSize); - WriteCloseBraceIndent(); - NewLine(); - - WriteLine("void CppSharp.Runtime.ICppMarshal.MarshalManagedToNative(global::System.IntPtr instance)"); - WriteStartBraceIndent(); - WriteCloseBraceIndent(); - NewLine(); - - WriteLine("void CppSharp.Runtime.ICppMarshal.MarshalNativeToManaged(global::System.IntPtr instance)"); - WriteStartBraceIndent(); - WriteCloseBraceIndent(); - NewLine(); - } - private void GenerateInterface(Class @class) { if (!@class.IsGenerated || @class.IsIncomplete) @@ -744,11 +720,6 @@ namespace CppSharp.Generators.CSharp { if (@class.IsRefType) bases.Add("IDisposable"); - - if (Options.GenerateClassMarshals) - { - bases.Add("CppSharp.Runtime.ICppMarshal"); - } } if (bases.Count > 0 && !@class.IsStatic) diff --git a/src/Generator/Options.cs b/src/Generator/Options.cs index a95aab28..adaaa32f 100644 --- a/src/Generator/Options.cs +++ b/src/Generator/Options.cs @@ -17,7 +17,6 @@ namespace CppSharp Modules = new List { SystemModule }; GeneratorKind = GeneratorKind.CSharp; - GenerateClassMarshals = false; OutputInteropIncludes = true; CommentPrefix = "///"; @@ -87,7 +86,6 @@ namespace CppSharp public bool OutputInteropIncludes; public bool GenerateFunctionTemplates; public bool GenerateInternalImports; - public bool GenerateClassMarshals; public bool UseHeaderDirectories; ///