diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs index afa2c060..92159f61 100644 --- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs +++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs @@ -288,7 +288,7 @@ namespace CppSharp.Generators.CLI WriteLineIndent("property {0} NativePtr;", nativeType); PushIndent(); - WriteLine("property System::IntPtr Instance"); + WriteLine("property System::IntPtr {0}", Helpers.InstanceIdentifier); WriteStartBraceIndent(); WriteLine("virtual System::IntPtr get();"); WriteLine("virtual void set(System::IntPtr instance);"); diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index e6caf952..4600a21d 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -152,16 +152,16 @@ namespace CppSharp.Generators.CLI if (CSharpTextTemplate.ShouldGenerateClassNativeField(@class)) { PushBlock(CLIBlockKind.Method); - WriteLine("System::IntPtr {0}::Instance::get()", - QualifiedIdentifier(@class)); + WriteLine("System::IntPtr {0}::{1}::get()", + QualifiedIdentifier(@class), Helpers.InstanceIdentifier); WriteStartBraceIndent(); WriteLine("return System::IntPtr(NativePtr);"); WriteCloseBraceIndent(); PopBlock(NewLineKind.BeforeNextBlock); PushBlock(CLIBlockKind.Method); - WriteLine("void {0}::Instance::set(System::IntPtr object)", - QualifiedIdentifier(@class)); + WriteLine("void {0}::{1}::set(System::IntPtr object)", + QualifiedIdentifier(@class), Helpers.InstanceIdentifier); WriteStartBraceIndent(); var nativeType = string.Format("::{0}*", @class.QualifiedOriginalName); WriteLine("NativePtr = ({0})object.ToPointer();", nativeType);