Browse Source

Revert "Factor the saving of original vtables pointers to its method."

This reverts commit 03f610f528.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/552/head
Dimitar Dobrev 10 years ago
parent
commit
f33ae8b801
  1. 34
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs

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

@ -1324,33 +1324,9 @@ namespace CppSharp.Generators.CSharp @@ -1324,33 +1324,9 @@ namespace CppSharp.Generators.CSharp
PopBlock(NewLineKind.BeforeNextBlock);
}
private void GenerateSaveOriginalVTables(Class @class)
{
WriteLine("void SaveOriginalVTables(global::System.IntPtr instance)");
WriteStartBraceIndent();
WriteLine("var native = (Internal*)instance.ToPointer();");
NewLine();
WriteLine("if (__OriginalVTables == null)");
WriteStartBraceIndent();
if (Options.IsMicrosoftAbi)
SaveOriginalVTablePointersMS(@class);
else
SaveOriginalVTablePointersItanium();
WriteCloseBraceIndent();
WriteCloseBraceIndent();
NewLine();
}
private void GenerateVTableClassSetup(Class @class, string dictionary,
IList<VTableComponent> entries, IList<VTableComponent> wrappedEntries)
{
GenerateSaveOriginalVTables(@class);
WriteLine("void SetupVTables(global::System.IntPtr instance)");
WriteStartBraceIndent();
@ -1369,7 +1345,15 @@ namespace CppSharp.Generators.CSharp @@ -1369,7 +1345,15 @@ namespace CppSharp.Generators.CSharp
NewLine();
// Save the original vftable pointers.
WriteLine("SaveOriginalVTables(instance);");
WriteLine("if (__OriginalVTables == null)");
WriteStartBraceIndent();
if (Driver.Options.IsMicrosoftAbi)
SaveOriginalVTablePointersMS(@class);
else
SaveOriginalVTablePointersItanium();
WriteCloseBraceIndent();
NewLine();
// Get the _Thunks

Loading…
Cancel
Save