From d8de32b17786daca084d6c3cf5eca96fc0a15f99 Mon Sep 17 00:00:00 2001 From: triton Date: Tue, 19 Mar 2013 15:16:25 +0000 Subject: [PATCH] Pass the current type when calling type maps. --- src/Generator/Generators/CLI/CLIMarshal.cs | 1 + src/Generator/Generators/CLI/CLITypePrinter.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs index 885b4cf5..be87fdf6 100644 --- a/src/Generator/Generators/CLI/CLIMarshal.cs +++ b/src/Generator/Generators/CLI/CLIMarshal.cs @@ -126,6 +126,7 @@ namespace Cxxi.Generators.CLI TypeMap typeMap = null; if (TypeMapDatabase.FindTypeMap(decl, out typeMap)) { + typeMap.Type = typedef; typeMap.CLIMarshalToManaged(Context); return typeMap.IsValueType; } diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs index 93d6f9c3..7c37afcb 100644 --- a/src/Generator/Generators/CLI/CLITypePrinter.cs +++ b/src/Generator/Generators/CLI/CLITypePrinter.cs @@ -148,6 +148,7 @@ namespace Cxxi.Generators.CLI TypeMap typeMap = null; if (TypeMapDatabase.FindTypeMap(decl, out typeMap)) { + typeMap.Type = typedef; return typeMap.CLISignature(); }