From 7d6f344324b8163d6fe54866069b6d79fc9746e5 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Mon, 8 Aug 2016 14:55:51 +0300 Subject: [PATCH] Improved the default names of libraries for inlines and template specialisations. Signed-off-by: Dimitar Dobrev --- src/AST/Module.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/AST/Module.cs b/src/AST/Module.cs index 98460e9f..40512b07 100644 --- a/src/AST/Module.cs +++ b/src/AST/Module.cs @@ -44,7 +44,11 @@ namespace CppSharp.AST { if (string.IsNullOrEmpty(inlinesLibraryName)) { - return string.Format("{0}-inlines", LibraryName); + if (string.IsNullOrEmpty(OutputNamespace)) + { + return string.Format("{0}-inlines", LibraryName); + } + return string.Format("{0}-inlines", OutputNamespace); } return inlinesLibraryName; } @@ -57,7 +61,11 @@ namespace CppSharp.AST { if (string.IsNullOrEmpty(templatesLibraryName)) { - return string.Format("{0}-templates", LibraryName); + if (string.IsNullOrEmpty(OutputNamespace)) + { + return string.Format("{0}-templates", LibraryName); + } + return string.Format("{0}-templates", OutputNamespace); } return templatesLibraryName; }