From d0a801172da6f165d1268808e335a93abbb9916a Mon Sep 17 00:00:00 2001 From: triton Date: Tue, 8 Apr 2014 12:42:28 +0100 Subject: [PATCH] Fixed type map matching under some cases by always printing names logically. --- src/Generator/Types/TypeMap.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Generator/Types/TypeMap.cs b/src/Generator/Types/TypeMap.cs index cfceaa38..74dd080d 100644 --- a/src/Generator/Types/TypeMap.cs +++ b/src/Generator/Types/TypeMap.cs @@ -145,7 +145,8 @@ namespace CppSharp.Types var typePrinter = new CppTypePrinter(this) { - PrintKind = CppTypePrintKind.GlobalQualified + PrintScopeKind = CppTypePrintScopeKind.GlobalQualified, + PrintLogicalNames = true }; if (FindTypeMap(decl.Visit(typePrinter), out typeMap)) @@ -154,14 +155,14 @@ namespace CppSharp.Types return true; } - typePrinter.PrintKind = CppTypePrintKind.Qualified; + typePrinter.PrintScopeKind = CppTypePrintScopeKind.Qualified; if (FindTypeMap(decl.Visit(typePrinter), out typeMap)) { typeMap.Type = type; return true; } - typePrinter.PrintKind = CppTypePrintKind.Local; + typePrinter.PrintScopeKind = CppTypePrintScopeKind.Local; if (FindTypeMap(decl.Visit(typePrinter), out typeMap)) { typeMap.Type = type; @@ -186,7 +187,7 @@ namespace CppSharp.Types return true; } - typePrinter.PrintKind = CppTypePrintKind.Qualified; + typePrinter.PrintScopeKind = CppTypePrintScopeKind.Qualified; if (FindTypeMap(type.Visit(typePrinter), out typeMap)) { typeMap.Type = type;