From 45a9dc4c2f58bb5b8d47716d92b6a11634276152 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 7 Dec 2017 23:56:45 +0200 Subject: [PATCH] Fixed a regression when a specialisation is mapped. Signed-off-by: Dimitar Dobrev --- src/Generator/Passes/CheckIgnoredDecls.cs | 4 +++- src/Generator/Types/Std/Stdlib.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Generator/Passes/CheckIgnoredDecls.cs b/src/Generator/Passes/CheckIgnoredDecls.cs index 61ec8086..47763786 100644 --- a/src/Generator/Passes/CheckIgnoredDecls.cs +++ b/src/Generator/Passes/CheckIgnoredDecls.cs @@ -50,7 +50,9 @@ namespace CppSharp.Passes if (!base.VisitClassTemplateSpecializationDecl(specialization)) return false; - if (!Options.GenerateClassTemplates && !specialization.IsExplicitlyGenerated) + TypeMap typeMap; + if (!Options.GenerateClassTemplates && !specialization.IsExplicitlyGenerated && + !Context.TypeMaps.FindTypeMap(specialization, out typeMap)) { specialization.ExplicitlyIgnore(); return false; diff --git a/src/Generator/Types/Std/Stdlib.cs b/src/Generator/Types/Std/Stdlib.cs index 55765e71..47c87047 100644 --- a/src/Generator/Types/Std/Stdlib.cs +++ b/src/Generator/Types/Std/Stdlib.cs @@ -392,7 +392,7 @@ namespace CppSharp.Types.Std } } - [TypeMap("std::ostream", GeneratorKind.CLI)] + [TypeMap("basic_ostream>", GeneratorKind.CLI)] public class OStream : TypeMap { public override string CLISignature(TypePrinterContext ctx)