Browse Source

Merge pull request #311 from ddobrev/master

Fixed a compilation error when wrapping abstract destructors
pull/313/head
João Matos 11 years ago
parent
commit
df70aea743
  1. 2
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  2. 6
      tests/Basic/Basic.h

2
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -1848,7 +1848,7 @@ namespace CppSharp.Generators.CSharp @@ -1848,7 +1848,7 @@ namespace CppSharp.Generators.CSharp
var dtor = @class.Methods.FirstOrDefault(method => method.IsDestructor);
if (dtor != null)
{
if (dtor.Access != AccessSpecifier.Private && @class.HasNonTrivialDestructor)
if (dtor.Access != AccessSpecifier.Private && @class.HasNonTrivialDestructor && !dtor.IsPure)
{
NativeLibrary library;
if (!Options.CheckSymbols ||

6
tests/Basic/Basic.h

@ -531,3 +531,9 @@ template<typename T> struct DependentType @@ -531,3 +531,9 @@ template<typename T> struct DependentType
{
DependentType(typename T::Dependent* t) { }
};
class PureDtor
{
public:
virtual ~PureDtor() = 0;
};

Loading…
Cancel
Save