summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-21 23:06:46 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-26 21:30:18 (GMT)
commitd90c9738da7003b966036c70727611b17d17f3a6 (patch)
tree1227d173d0b503da5c1acd2218494d312e3a999f
parent331023ae06b795a1733ae03dce2ce2197ca1c36a (diff)
downloadCMake-d90c9738da7003b966036c70727611b17d17f3a6.zip
CMake-d90c9738da7003b966036c70727611b17d17f3a6.tar.gz
CMake-d90c9738da7003b966036c70727611b17d17f3a6.tar.bz2
Makefiles: Remove some unneeded casts
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx5
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b4a915c..c4e28ca 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -158,8 +158,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
}
for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
- cmLocalUnixMakefileGenerator3 *lg =
- static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
+ cmLocalGenerator *lg = this->LocalGenerators[i];
std::string markFileName = lg->GetCurrentBinaryDirectory();
markFileName += "/";
markFileName += cmake::GetCMakeFilesDirectory();
@@ -982,7 +981,7 @@ cmGlobalUnixMakefileGenerator3
//----------------------------------------------------------------------------
size_t
cmGlobalUnixMakefileGenerator3
-::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg)
+::CountProgressMarksInAll(cmLocalGenerator* lg)
{
size_t count = 0;
std::set<cmGeneratorTarget const*> emitted;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 63ffcb4..54fdc0e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,7 +198,7 @@ protected:
size_t CountProgressMarksInTarget(cmGeneratorTarget const* target,
std::set<cmGeneratorTarget const*>& emitted);
- size_t CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg);
+ size_t CountProgressMarksInAll(cmLocalGenerator* lg);
cmGeneratedFileStream *CommandDatabase;
private: