This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch upstream/latest in repository colobot.
commit 81096fd2ae430d272fe60f6f88ca55a105b3b3e0 Author: Piotr Dziwinski <[email protected]> Date: Tue Apr 28 19:29:32 2015 +0200 Fix Clang and GCC 4.6 compilation --- CMakeLists.txt | 1 + test/unit/app/app_test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a069ba7..be9f0b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(RELEASE_CXX_FLAGS "-O2") set(DEBUG_CXX_FLAGS "-g -O0") set(TEST_CXX_FLAGS "-pthread") + add_definitions(-DOVERRIDE=override) add_definitions(-DNOEXCEPT=noexcept) elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") message(STATUS "Detected MSVC compiler") diff --git a/test/unit/app/app_test.cpp b/test/unit/app/app_test.cpp index fff08a5..d4dade9 100644 --- a/test/unit/app/app_test.cpp +++ b/test/unit/app/app_test.cpp @@ -46,7 +46,7 @@ struct FakeSystemTimeStamp : public SystemTimeStamp class CApplicationWrapper : public CApplication { public: - virtual Event CreateUpdateEvent() override + virtual Event CreateUpdateEvent() OVERRIDE { return CApplication::CreateUpdateEvent(); } @@ -57,8 +57,8 @@ class ApplicationUT : public testing::Test protected: ApplicationUT(); - virtual void SetUp() override; - virtual void TearDown() override; + virtual void SetUp() OVERRIDE; + virtual void TearDown() OVERRIDE; void NextInstant(long long diff); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
