Browse Source

Clean all warnings in the non-generated C#

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1344/head
Dimitar Dobrev 5 years ago
parent
commit
c23bc89f86
  1. 2
      src/Generator/Generators/C/CCodeGenerator.cs
  2. 1
      src/Generator/Generators/C/CppHeaders.cs
  3. 22
      src/Generator/Generators/CLI/CLITemplate.cs
  4. 2
      tests/CSharp/CSharp.cs

2
src/Generator/Generators/C/CCodeGenerator.cs

@ -307,7 +307,7 @@ namespace CppSharp.Generators.C
if (method.OperatorKind == CXXOperatorKind.Star) if (method.OperatorKind == CXXOperatorKind.Star)
{ {
CTypePrinter.PushContext(TypePrinterContextKind.Native); CTypePrinter.PushContext(TypePrinterContextKind.Native);
var conversionType = method.ReturnType.Visit(CTypePrinter); method.ReturnType.Visit(CTypePrinter);
CTypePrinter.PopContext(); CTypePrinter.PopContext();
} }

1
src/Generator/Generators/C/CppHeaders.cs

@ -419,7 +419,6 @@ namespace CppSharp.Generators.Cpp
GenerateDeclarationCommon(field); GenerateDeclarationCommon(field);
var @class = field.Namespace as Class;
var fieldType = field.Type.Visit(CTypePrinter); var fieldType = field.Type.Visit(CTypePrinter);
WriteLine($"{fieldType} {field.Name};"); WriteLine($"{fieldType} {field.Name};");

22
src/Generator/Generators/CLI/CLITemplate.cs

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using CppSharp.AST; using CppSharp.AST;
using CppSharp.Generators.C; using CppSharp.Generators.C;
@ -12,14 +11,8 @@ namespace CppSharp.Generators.CLI
/// </summary> /// </summary>
public abstract class CLITemplate : CCodeGenerator public abstract class CLITemplate : CCodeGenerator
{ {
public ISet<CInclude> Includes;
protected CLITemplate(BindingContext context, IEnumerable<TranslationUnit> units) protected CLITemplate(BindingContext context, IEnumerable<TranslationUnit> units)
: base(context, units) : base(context, units) => typePrinter = new CLITypePrinter(context);
{
typePrinter = new CLITypePrinter(context);
Includes = new HashSet<CInclude>();
}
public abstract override string FileExtension { get; } public abstract override string FileExtension { get; }
@ -27,19 +20,6 @@ namespace CppSharp.Generators.CLI
#region Helpers #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) public string GetMethodName(Method method)
{ {
if (method.OperatorKind == CXXOperatorKind.Conversion || if (method.OperatorKind == CXXOperatorKind.Conversion ||

2
tests/CSharp/CSharp.cs

@ -56,7 +56,7 @@ namespace CppSharp.Tests
select macro.Name).ToList(); select macro.Name).ToList();
var enumTest = ctx.GenerateEnumFromMacros("MyMacroTestEnum", list.ToArray()); 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() enumTest.Namespace = new Namespace()
{ {

Loading…
Cancel
Save