From 180535ba3af7e986b444851ecf177940961d98da Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sat, 18 Jul 2015 00:38:56 +0100 Subject: [PATCH] Removed all remaining inlined bodies in order to fix the tests on Linux. Signed-off-by: Dimitar Dobrev --- tests/CSharpTemp/CSharpTemp.cpp | 27 +++++++++++++++++++++++++++ tests/CSharpTemp/CSharpTemp.h | 12 +++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/tests/CSharpTemp/CSharpTemp.cpp b/tests/CSharpTemp/CSharpTemp.cpp index 85ab4c2f..d5e88d88 100644 --- a/tests/CSharpTemp/CSharpTemp.cpp +++ b/tests/CSharpTemp/CSharpTemp.cpp @@ -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) return bar; } +ForceCreationOfInterface::ForceCreationOfInterface() +{ +} + int Baz::takesQux(const Qux& qux) { return qux.farAwayFunc(); @@ -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) { } +HasPrivateOverride::HasPrivateOverride() +{ +} + void HasPrivateOverride::privateOverride(int i) { } @@ -620,10 +635,22 @@ TestParamToInterfacePass::TestParamToInterfacePass() : TestParamToInterfacePassB { } +HasProtectedVirtual::HasProtectedVirtual() +{ +} + void HasProtectedVirtual::protectedVirtual() { } +InheritanceBuffer::InheritanceBuffer() +{ +} + +InheritsProtectedVirtualFromSecondaryBase::InheritsProtectedVirtualFromSecondaryBase() +{ +} + void InheritsProtectedVirtualFromSecondaryBase::protectedVirtual() { } diff --git a/tests/CSharpTemp/CSharpTemp.h b/tests/CSharpTemp/CSharpTemp.h index 6d865127..4d054af1 100644 --- a/tests/CSharpTemp/CSharpTemp.h +++ b/tests/CSharpTemp/CSharpTemp.h @@ -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: // Tests destructors struct DLL_API TestDestructors { - static void InitMarker() { Marker = 0; } + static void InitMarker(); static int Marker; TestDestructors(); @@ -330,6 +332,8 @@ public: class DLL_API HasPrivateOverride : public HasPrivateOverrideBase { +public: + HasPrivateOverride(); private: virtual void privateOverride(int i); }; @@ -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(); };