This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch upstream/latest in repository colobot.
commit bca9a019ae6ca734cab9199e05d0acaf7df63da7 Author: Piotr Dziwinski <[email protected]> Date: Mon Apr 27 19:03:17 2015 +0200 Suppress some MSVC warnings --- CMakeLists.txt | 2 +- src/common/resources/resourcemanager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0caa24f..a069ba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") message(STATUS "Detected MSVC compiler") set(CXX11_FLAGS "") - set(NORMAL_CXX_FLAGS "") + set(NORMAL_CXX_FLAGS "/wd\"4244\" /wd\"4309\" /wd\"4800\" /wd\"4996\"") # disable some useless warnings set(RELEASE_CXX_FLAGS "") set(DEBUG_CXX_FLAGS "") set(TEST_CXX_FLAGS "") diff --git a/src/common/resources/resourcemanager.cpp b/src/common/resources/resourcemanager.cpp index 80733ba..fba68cf 100644 --- a/src/common/resources/resourcemanager.cpp +++ b/src/common/resources/resourcemanager.cpp @@ -194,7 +194,7 @@ bool CResourceManager::RemoveDirectory(const std::string& directory) fs::remove_all(path); #endif } - catch (std::exception & e) + catch (std::exception&) { success = false; } @@ -284,7 +284,7 @@ bool CResourceManager::Move(const std::string& from, const std::string& to) fs::rename(path_from, path_to); #endif } - catch (std::exception & e) + catch (std::exception&) { success = false; } -- 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
