diff --git a/src/Generator/Generators/C/CCodeGenerator.cs b/src/Generator/Generators/C/CCodeGenerator.cs index 9256fea9..a0538acb 100644 --- a/src/Generator/Generators/C/CCodeGenerator.cs +++ b/src/Generator/Generators/C/CCodeGenerator.cs @@ -307,7 +307,7 @@ namespace CppSharp.Generators.C if (method.OperatorKind == CXXOperatorKind.Star) { CTypePrinter.PushContext(TypePrinterContextKind.Native); - var conversionType = method.ReturnType.Visit(CTypePrinter); + method.ReturnType.Visit(CTypePrinter); CTypePrinter.PopContext(); } diff --git a/src/Generator/Generators/C/CppHeaders.cs b/src/Generator/Generators/C/CppHeaders.cs index e21b8e35..347006d6 100644 --- a/src/Generator/Generators/C/CppHeaders.cs +++ b/src/Generator/Generators/C/CppHeaders.cs @@ -419,7 +419,6 @@ namespace CppSharp.Generators.Cpp GenerateDeclarationCommon(field); - var @class = field.Namespace as Class; var fieldType = field.Type.Visit(CTypePrinter); WriteLine($"{fieldType} {field.Name};"); diff --git a/src/Generator/Generators/CLI/CLITemplate.cs b/src/Generator/Generators/CLI/CLITemplate.cs index 1d236e5a..63387d04 100644 --- a/src/Generator/Generators/CLI/CLITemplate.cs +++ b/src/Generator/Generators/CLI/CLITemplate.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using CppSharp.AST; using CppSharp.Generators.C; @@ -12,14 +11,8 @@ namespace CppSharp.Generators.CLI /// public abstract class CLITemplate : CCodeGenerator { - public ISet Includes; - protected CLITemplate(BindingContext context, IEnumerable units) - : base(context, units) - { - typePrinter = new CLITypePrinter(context); - Includes = new HashSet(); - } + : base(context, units) => typePrinter = new CLITypePrinter(context); public abstract override string FileExtension { get; } @@ -27,19 +20,6 @@ namespace CppSharp.Generators.CLI #region Helpers - public string QualifiedIdentifier(Declaration decl) - { - if (!string.IsNullOrEmpty(TranslationUnit.Module.OutputNamespace)) - { - if (string.IsNullOrEmpty(decl.QualifiedName)) - return $"{decl.TranslationUnit.Module.OutputNamespace}"; - - return $"{decl.TranslationUnit.Module.OutputNamespace}::{decl.QualifiedName}"; - } - - return decl.QualifiedName; - } - public string GetMethodName(Method method) { if (method.OperatorKind == CXXOperatorKind.Conversion || diff --git a/tests/CSharp/CSharp.cs b/tests/CSharp/CSharp.cs index 2ead16a0..98baa5e3 100644 --- a/tests/CSharp/CSharp.cs +++ b/tests/CSharp/CSharp.cs @@ -56,7 +56,7 @@ namespace CppSharp.Tests select macro.Name).ToList(); var enumTest = ctx.GenerateEnumFromMacros("MyMacroTestEnum", list.ToArray()); - var enumTest2 = ctx.GenerateEnumFromMacros("MyMacroTest2Enum", "MY_MACRO_TEST2_*"); + ctx.GenerateEnumFromMacros("MyMacroTest2Enum", "MY_MACRO_TEST2_*"); enumTest.Namespace = new Namespace() {