Browse Source

Fixed a regression when a method called "dispose" is wrapped.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/787/merge
Dimitar Dobrev 9 years ago
parent
commit
358c03e261
  1. 3
      src/Generator/Passes/RenamePass.cs
  2. 4
      tests/Common/Common.cpp
  3. 1
      tests/Common/Common.h

3
src/Generator/Passes/RenamePass.cs

@ -80,7 +80,8 @@ namespace CppSharp.Passes @@ -80,7 +80,8 @@ namespace CppSharp.Passes
if (method != null)
{
return Targets.HasFlag(RenameTargets.Method) &&
method.Kind == CXXMethodKind.Normal;
method.Kind == CXXMethodKind.Normal &&
method.Name != "dispose";
}
var function = decl as Function;

4
tests/Common/Common.cpp

@ -653,6 +653,10 @@ void HasOverloadsWithDifferentPointerKindsToSameType::overload(const int& i) @@ -653,6 +653,10 @@ void HasOverloadsWithDifferentPointerKindsToSameType::overload(const int& i)
{
}
void HasOverloadsWithDifferentPointerKindsToSameType::dispose()
{
}
void hasPointerParam(Foo* foo, int i)
{
}

1
tests/Common/Common.h

@ -1212,6 +1212,7 @@ public: @@ -1212,6 +1212,7 @@ public:
void overload(int& i);
void overload(int&& i);
void overload(const int& i);
void dispose();
};
DLL_API void hasPointerParam(Foo* foo, int i);

Loading…
Cancel
Save