This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3c64f7fe7a468d5b497df9694f6c00a6c68bc189 (commit)
via 51e5a7b74342099fed211dadaf968a168c5c448a (commit)
from 961e6eab56fed5dbd163dddbc23f97b3b549b104 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c64f7fe7a468d5b497df9694f6c00a6c68bc189
commit 3c64f7fe7a468d5b497df9694f6c00a6c68bc189
Merge: 961e6ea 51e5a7b
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 17:55:34 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 12 17:55:34 2014 -0500
Merge topic 'dev/ninja-speedup' into next
51e5a7b7 Fix a warning on MSVC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51e5a7b74342099fed211dadaf968a168c5c448a
commit 51e5a7b74342099fed211dadaf968a168c5c448a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 17:55:01 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 17:55:01 2014 -0500
Fix a warning on MSVC
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 84b96fa..da4bdad 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -136,7 +136,7 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile
*source,
// this->AddFortranFlags(flags);
// }
- bool hasLangCached = this->LanguageFlags.count(language);
+ bool hasLangCached = this->LanguageFlags.count(language) != 0;
std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
std::string& languageFlags = this->LanguageFlags[language];
if(!hasLangCached)
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaTargetGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
