From e168e84d6aea450daa6b20b53258524102fcca3a Mon Sep 17 00:00:00 2001 From: marcos henrich Date: Mon, 22 Jul 2013 02:35:58 +0100 Subject: [PATCH] Resolved ambiguity of System.Type and CppSharp.AST.Type --- src/Generator/Generators/CLI/CLITypePrinter.cs | 3 ++- src/Generator/Generators/CSharp/CSharpGenerator.cs | 2 +- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 3 ++- src/Generator/Generators/CSharp/CSharpTypePrinter.cs | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs index ca98abdd..83f5ecba 100644 --- a/src/Generator/Generators/CLI/CLITypePrinter.cs +++ b/src/Generator/Generators/CLI/CLITypePrinter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using CppSharp.AST; using CppSharp.Types; +using Type = CppSharp.AST.Type; namespace CppSharp.Generators.CLI { @@ -340,7 +341,7 @@ namespace CppSharp.Generators.CLI throw new NotImplementedException(); } - public string ToString(AST.Type type) + public string ToString(Type type) { return type.Visit(this); } diff --git a/src/Generator/Generators/CSharp/CSharpGenerator.cs b/src/Generator/Generators/CSharp/CSharpGenerator.cs index 2e429eee..30d75eea 100644 --- a/src/Generator/Generators/CSharp/CSharpGenerator.cs +++ b/src/Generator/Generators/CSharp/CSharpGenerator.cs @@ -13,7 +13,7 @@ namespace CppSharp.Generators.CSharp public CSharpGenerator(Driver driver) : base(driver) { typePrinter = new CSharpTypePrinter(driver.TypeDatabase, driver.Library); - AST.Type.TypePrinterDelegate += type => type.Visit(typePrinter).Type; + CppSharp.AST.Type.TypePrinterDelegate += type => type.Visit(typePrinter).Type; } public override List