summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-25 12:48:59 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-25 13:05:15 (GMT)
commit6fc4cd86806b349c804cf9dacb2dd04c289a684f (patch)
treed14bd8a90831a301d911629357a613262bc4e9d4 /Source/cmGlobalUnixMakefileGenerator3.cxx
parentda0190a4a7511b33e6c373b735ccd2e132e083e5 (diff)
downloadCMake-6fc4cd86806b349c804cf9dacb2dd04c289a684f.zip
CMake-6fc4cd86806b349c804cf9dacb2dd04c289a684f.tar.gz
CMake-6fc4cd86806b349c804cf9dacb2dd04c289a684f.tar.bz2
Fix or cast integer conversions in cmake
These were revealed by GCC's -Wconversion option. Fix types where it is easy to do so. Cast in cases we know the integer will not be truncated.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b687fe1..4e8e7e6 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -750,8 +750,9 @@ cmGlobalUnixMakefileGenerator3
cmLocalGenerator::FULL,
cmLocalGenerator::SHELL);
progCmd << " ";
- std::vector<int> &progFiles = this->ProgressMap[&t->second].Marks;
- for (std::vector<int>::iterator i = progFiles.begin();
+ std::vector<unsigned long>& progFiles =
+ this->ProgressMap[&t->second].Marks;
+ for (std::vector<unsigned long>::iterator i = progFiles.begin();
i != progFiles.end(); ++i)
{
progCmd << " " << *i;