Browse Source

Use the existing instance identifier constant in the CLI backend to match the C# generator.

pull/159/head
triton 12 years ago
parent
commit
d49a1eedb1
  1. 2
      src/Generator/Generators/CLI/CLIHeadersTemplate.cs
  2. 8
      src/Generator/Generators/CLI/CLISourcesTemplate.cs

2
src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@ -288,7 +288,7 @@ namespace CppSharp.Generators.CLI
WriteLineIndent("property {0} NativePtr;", nativeType); WriteLineIndent("property {0} NativePtr;", nativeType);
PushIndent(); PushIndent();
WriteLine("property System::IntPtr Instance"); WriteLine("property System::IntPtr {0}", Helpers.InstanceIdentifier);
WriteStartBraceIndent(); WriteStartBraceIndent();
WriteLine("virtual System::IntPtr get();"); WriteLine("virtual System::IntPtr get();");
WriteLine("virtual void set(System::IntPtr instance);"); WriteLine("virtual void set(System::IntPtr instance);");

8
src/Generator/Generators/CLI/CLISourcesTemplate.cs

@ -152,16 +152,16 @@ namespace CppSharp.Generators.CLI
if (CSharpTextTemplate.ShouldGenerateClassNativeField(@class)) if (CSharpTextTemplate.ShouldGenerateClassNativeField(@class))
{ {
PushBlock(CLIBlockKind.Method); PushBlock(CLIBlockKind.Method);
WriteLine("System::IntPtr {0}::Instance::get()", WriteLine("System::IntPtr {0}::{1}::get()",
QualifiedIdentifier(@class)); QualifiedIdentifier(@class), Helpers.InstanceIdentifier);
WriteStartBraceIndent(); WriteStartBraceIndent();
WriteLine("return System::IntPtr(NativePtr);"); WriteLine("return System::IntPtr(NativePtr);");
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
PushBlock(CLIBlockKind.Method); PushBlock(CLIBlockKind.Method);
WriteLine("void {0}::Instance::set(System::IntPtr object)", WriteLine("void {0}::{1}::set(System::IntPtr object)",
QualifiedIdentifier(@class)); QualifiedIdentifier(@class), Helpers.InstanceIdentifier);
WriteStartBraceIndent(); WriteStartBraceIndent();
var nativeType = string.Format("::{0}*", @class.QualifiedOriginalName); var nativeType = string.Format("::{0}*", @class.QualifiedOriginalName);
WriteLine("NativePtr = ({0})object.ToPointer();", nativeType); WriteLine("NativePtr = ({0})object.ToPointer();", nativeType);

Loading…
Cancel
Save