Browse Source

Merge pull request #314 from ddobrev/master

Added a check for ignored ctors
pull/315/head
João Matos 11 years ago
parent
commit
8a7ac7372e
  1. 4
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  2. 4
      tests/Basic/Basic.cpp
  3. 7
      tests/Basic/Basic.h

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

@ -497,10 +497,10 @@ namespace CppSharp.Generators.CSharp
{ {
foreach (var ctor in @class.Constructors) foreach (var ctor in @class.Constructors)
{ {
if (@class.IsStatic) if (@class.IsStatic || ctor.IsMoveConstructor)
continue; continue;
if (ctor.IsMoveConstructor) if (!ctor.IsGenerated && !(Options.GenerateCopyConstructors && ctor.IsCopyConstructor))
continue; continue;
if (ctor.IsDefaultConstructor && !@class.HasNonTrivialDefaultConstructor) if (ctor.IsDefaultConstructor && !@class.HasNonTrivialDefaultConstructor)

4
tests/Basic/Basic.cpp

@ -10,6 +10,10 @@ Foo::Foo()
SomePointerPointer = &SomePointer; SomePointerPointer = &SomePointer;
} }
Foo::Foo(Private p)
{
}
const char* Foo::GetANSI() const char* Foo::GetANSI()
{ {
return "ANSI"; return "ANSI";

7
tests/Basic/Basic.h

@ -13,9 +13,16 @@ private:
class DLL_API Foo class DLL_API Foo
{ {
private:
enum Private
{
Value1,
Value2
};
public: public:
Foo(); Foo();
Foo(Private p);
int A; int A;
float B; float B;
IgnoredType ignoredType; IgnoredType ignoredType;

Loading…
Cancel
Save