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

12
tests/CSharpTemp/CSharpTemp.h

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

Loading…
Cancel
Save