Browse Source

Ensure a tested specialization is really generated

The only function to use the specialization in question is actually ignored because the types of two of its parameters aren't supported. This was hidden by an otherwise redundant definition of a C++ symbol which is now removed.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1548/head
Dimitar Dobrev 5 years ago
parent
commit
c18d047daf
  1. 1
      src/Generator.Tests/GeneratorTest.cs
  2. 7
      tests/CSharp/CSharpTemplates.cpp
  3. 4
      tests/CSharp/CSharpTemplates.h

1
src/Generator.Tests/GeneratorTest.cs

@ -40,7 +40,6 @@ namespace CppSharp.Utils @@ -40,7 +40,6 @@ namespace CppSharp.Utils
var path = Path.GetFullPath(GetTestsDirectory(name));
testModule.IncludeDirs.Add(path);
testModule.Defines.Add("DLL_EXPORT");
Diagnostics.Message("Looking for tests in: {0}", path);
var files = Directory.EnumerateFiles(path, "*.h");

7
tests/CSharp/CSharpTemplates.cpp

@ -130,8 +130,11 @@ void TemplateSpecializer::completeSpecializationInParameter(TwoTemplateArgs<int @@ -130,8 +130,11 @@ void TemplateSpecializer::completeSpecializationInParameter(TwoTemplateArgs<int
TwoTemplateArgs<int *, int> p2,
TwoTemplateArgs<int *, float> p3,
TwoTemplateArgs<const char *, int> p4,
TwoTemplateArgs<QString, int> p5,
TwoTemplateArgs<const char *, int>::iterator p6,
TwoTemplateArgs<QString, int> p5)
{
}
void TemplateSpecializer::completeSpecializationInParameter(TwoTemplateArgs<const char *, int>::iterator p6,
TwoTemplateArgs<QString, int>::iterator p7)
{
}

4
tests/CSharp/CSharpTemplates.h

@ -580,8 +580,8 @@ public: @@ -580,8 +580,8 @@ public:
TwoTemplateArgs<int*, int> p2,
TwoTemplateArgs<int*, float> p3,
TwoTemplateArgs<const char*, int> p4,
TwoTemplateArgs<QString, int> p5,
TwoTemplateArgs<const char*, int>::iterator p6,
TwoTemplateArgs<QString, int> p5);
void completeSpecializationInParameter(TwoTemplateArgs<const char*, int>::iterator p6,
TwoTemplateArgs<QString, int>::iterator p7);
VirtualTemplate<void> returnSpecializedWithVoid();
private:

Loading…
Cancel
Save