immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Clang and GCC 4.6 compilation

master
Piotr Dziwinski 2015-04-28 19:29:32 +02:00
parent 4c8127c6ec
commit 81096fd2ae
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -140,6 +140,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(RELEASE_CXX_FLAGS "-O2") set(RELEASE_CXX_FLAGS "-O2")
set(DEBUG_CXX_FLAGS "-g -O0") set(DEBUG_CXX_FLAGS "-g -O0")
set(TEST_CXX_FLAGS "-pthread") set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DOVERRIDE=override)
add_definitions(-DNOEXCEPT=noexcept) add_definitions(-DNOEXCEPT=noexcept)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
message(STATUS "Detected MSVC compiler") message(STATUS "Detected MSVC compiler")

6
test/unit/app/app_test.cpp
View File

@ -46,7 +46,7 @@ struct FakeSystemTimeStamp : public SystemTimeStamp
class CApplicationWrapper : public CApplication class CApplicationWrapper : public CApplication
{ {
public: public:
virtual Event CreateUpdateEvent() override virtual Event CreateUpdateEvent() OVERRIDE
{ {
return CApplication::CreateUpdateEvent(); return CApplication::CreateUpdateEvent();
} }
@ -57,8 +57,8 @@ class ApplicationUT : public testing::Test
protected: protected:
ApplicationUT(); ApplicationUT();
virtual void SetUp() override; virtual void SetUp() OVERRIDE;
virtual void TearDown() override; virtual void TearDown() OVERRIDE;
void NextInstant(long long diff); void NextInstant(long long diff);