summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-06-20 13:50:45 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-06-20 13:50:45 (GMT)
commitfe99b156e5b8ddf34d2635c3c3192cfafd9b63af (patch)
tree1df59849d11bbf925ff206938fd786fa356a1759 /Source/cmGlobalUnixMakefileGenerator3.cxx
parent15ca72a862ce23f2b9738255d11168b57ef656a8 (diff)
downloadCMake-fe99b156e5b8ddf34d2635c3c3192cfafd9b63af.zip
CMake-fe99b156e5b8ddf34d2635c3c3192cfafd9b63af.tar.gz
CMake-fe99b156e5b8ddf34d2635c3c3192cfafd9b63af.tar.bz2
ENH: fix line length and warning
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 cf7d748..3941d9f 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -868,7 +868,8 @@ cmGlobalUnixMakefileGenerator3
cmLocalGenerator::FULL,
cmLocalGenerator::SHELL);
//
- progCmd << " " << this->GetTargetTotalNumberOfProgressFiles(t->second);
+ progCmd << " "
+ << this->GetTargetTotalNumberOfProgressFiles(t->second);
commands.push_back(progCmd.str());
}
std::string tmp = cmake::GetCMakeFilesDirectoryPostSlash();
@@ -944,7 +945,7 @@ int cmGlobalUnixMakefileGenerator3
cmLocalUnixMakefileGenerator3 *lg =
static_cast<cmLocalUnixMakefileGenerator3 *>
(target.GetMakefile()->GetLocalGenerator());
- int result = lg->ProgressFiles[target.GetName()].size();
+ int result = static_cast<int>(lg->ProgressFiles[target.GetName()].size());
std::vector<cmTarget *>& depends = this->GetTargetDepends(target);
std::vector<cmTarget *>::iterator i;