Browse Source

Removed all remaining inlined bodies in order to fix the tests on Linux.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/520/head
Dimitar Dobrev 10 years ago
parent
commit
180535ba3a
  1. 27
      tests/CSharpTemp/CSharpTemp.cpp
  2. 12
      tests/CSharpTemp/CSharpTemp.h

27
tests/CSharpTemp/CSharpTemp.cpp

@ -35,6 +35,8 @@ void Foo::setNoParams()
{ {
} }
const int Foo::rename;
const Foo& Bar::operator[](int i) const const Foo& Bar::operator[](int i) const
{ {
return m_foo; return m_foo;
@ -144,6 +146,10 @@ Bar Bar::operator ++(int i)
return bar; return bar;
} }
ForceCreationOfInterface::ForceCreationOfInterface()
{
}
int Baz::takesQux(const Qux& qux) int Baz::takesQux(const Qux& qux)
{ {
return qux.farAwayFunc(); return qux.farAwayFunc();
@ -295,6 +301,11 @@ void P::setIsBool(bool value)
} }
void TestDestructors::InitMarker()
{
Marker = 0;
}
int TestDestructors::Marker = 0; int TestDestructors::Marker = 0;
TestCopyConstructorVal::TestCopyConstructorVal() TestCopyConstructorVal::TestCopyConstructorVal()
@ -453,6 +464,10 @@ void HasPrivateOverrideBase::privateOverride(int i)
{ {
} }
HasPrivateOverride::HasPrivateOverride()
{
}
void HasPrivateOverride::privateOverride(int i) void HasPrivateOverride::privateOverride(int i)
{ {
} }
@ -620,10 +635,22 @@ TestParamToInterfacePass::TestParamToInterfacePass() : TestParamToInterfacePassB
{ {
} }
HasProtectedVirtual::HasProtectedVirtual()
{
}
void HasProtectedVirtual::protectedVirtual() void HasProtectedVirtual::protectedVirtual()
{ {
} }
InheritanceBuffer::InheritanceBuffer()
{
}
InheritsProtectedVirtualFromSecondaryBase::InheritsProtectedVirtualFromSecondaryBase()
{
}
void InheritsProtectedVirtualFromSecondaryBase::protectedVirtual() void InheritsProtectedVirtualFromSecondaryBase::protectedVirtual()
{ {
} }

12
tests/CSharpTemp/CSharpTemp.h

@ -75,6 +75,8 @@ Bar::Bar() {}
class DLL_API ForceCreationOfInterface : public Foo, public Bar class DLL_API ForceCreationOfInterface : public Foo, public Bar
{ {
public:
ForceCreationOfInterface();
}; };
class DLL_API Baz : public Foo, public Bar class DLL_API Baz : public Foo, public Bar
@ -200,7 +202,7 @@ private:
// Tests destructors // Tests destructors
struct DLL_API TestDestructors struct DLL_API TestDestructors
{ {
static void InitMarker() { Marker = 0; } static void InitMarker();
static int Marker; static int Marker;
TestDestructors(); TestDestructors();
@ -330,6 +332,8 @@ public:
class DLL_API HasPrivateOverride : public HasPrivateOverrideBase class DLL_API HasPrivateOverride : public HasPrivateOverrideBase
{ {
public:
HasPrivateOverride();
private: private:
virtual void privateOverride(int i); virtual void privateOverride(int i);
}; };
@ -566,16 +570,22 @@ public:
class DLL_API HasProtectedVirtual class DLL_API HasProtectedVirtual
{ {
public:
HasProtectedVirtual();
protected: protected:
virtual void protectedVirtual(); virtual void protectedVirtual();
}; };
class DLL_API InheritanceBuffer : public Foo, public HasProtectedVirtual class DLL_API InheritanceBuffer : public Foo, public HasProtectedVirtual
{ {
public:
InheritanceBuffer();
}; };
class DLL_API InheritsProtectedVirtualFromSecondaryBase : public InheritanceBuffer class DLL_API InheritsProtectedVirtualFromSecondaryBase : public InheritanceBuffer
{ {
public:
InheritsProtectedVirtualFromSecondaryBase();
protected: protected:
void protectedVirtual(); void protectedVirtual();
}; };

Loading…
Cancel
Save