[cmake-commits] hoffman committed cmGlobalGenerator.cxx 1.221 1.222
cmGlobalGenerator.h 1.104 1.105
cmGlobalUnixMakefileGenerator3.cxx 1.124 1.125
cmGlobalUnixMakefileGenerator3.h 1.53 1.54
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jan 30 22:56:36 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv25098
Modified Files:
cmGlobalGenerator.cxx cmGlobalGenerator.h
cmGlobalUnixMakefileGenerator3.cxx
cmGlobalUnixMakefileGenerator3.h
Log Message:
ENH: remove const
Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- cmGlobalGenerator.h 30 Jan 2008 17:04:38 -0000 1.104
+++ cmGlobalGenerator.h 31 Jan 2008 03:56:34 -0000 1.105
@@ -232,11 +232,11 @@
virtual const char* GetCleanTargetName() { return 0; }
// Class to track a set of dependencies.
- class TargetDependSet: public std::set<cmTarget const*> {};
+ class TargetDependSet: public std::set<cmTarget*> {};
// what targets does the specified target depend on directly
// via a target_link_libraries or add_dependencies
- TargetDependSet const& GetTargetDirectDepends(cmTarget const& target);
+ TargetDependSet & GetTargetDirectDepends(cmTarget & target);
const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
const {return this->ProjectMap;}
@@ -281,7 +281,7 @@
cmLocalGenerator* CurrentLocalGenerator;
// map from project name to vector of local generators in that project
std::map<cmStdString, std::vector<cmLocalGenerator*> > ProjectMap;
- std::map<cmLocalGenerator*, std::set<cmTarget const*> >
+ std::map<cmLocalGenerator*, std::set<cmTarget *> >
LocalGeneratorToTargetMap;
// Set of named installation components requested by the project.
@@ -314,12 +314,12 @@
std::vector<std::string> FilesReplacedDuringGenerate;
// Track inter-target dependencies.
- bool ConsiderTargetDepends(cmTarget const* depender,
+ bool ConsiderTargetDepends(cmTarget * depender,
TargetDependSet& depender_depends,
const char* dependee_name);
- bool FindDependency(cmTarget const* goal, cmTarget const* current,
- std::vector<cmTarget const*>& steps);
- typedef std::map<cmTarget const*, TargetDependSet> TargetDependMap;
+ bool FindDependency(cmTarget * goal, cmTarget * current,
+ std::vector<cmTarget *>& steps);
+ typedef std::map<cmTarget *, TargetDependSet> TargetDependMap;
TargetDependMap TargetDependencies;
// Cache directory content and target files to be built.
Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- cmGlobalUnixMakefileGenerator3.cxx 30 Jan 2008 17:04:38 -0000 1.124
+++ cmGlobalUnixMakefileGenerator3.cxx 31 Jan 2008 03:56:34 -0000 1.125
@@ -848,7 +848,7 @@
//----------------------------------------------------------------------------
int cmGlobalUnixMakefileGenerator3
-::GetTargetTotalNumberOfActions(cmTarget const& target,
+::GetTargetTotalNumberOfActions(cmTarget & target,
std::set<cmStdString> &emitted)
{
// do not double count
@@ -861,9 +861,9 @@
(target.GetMakefile()->GetLocalGenerator());
result = static_cast<int>(lg->ProgressFiles[target.GetName()].size());
- TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+ TargetDependSet & depends = this->GetTargetDirectDepends(target);
- TargetDependSet::const_iterator i;
+ TargetDependSet::iterator i;
for (i = depends.begin(); i != depends.end(); ++i)
{
result += this->GetTargetTotalNumberOfActions(**i, emitted);
@@ -877,11 +877,11 @@
::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
{
unsigned long result = 0;
- std::set<cmTarget const*>& targets = this->LocalGeneratorToTargetMap[lg];
- for(std::set<cmTarget const*>::iterator t = targets.begin();
+ std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
+ for(std::set<cmTarget *>::iterator t = targets.begin();
t != targets.end(); ++t)
{
- cmTarget const* target = *t;
+ cmTarget * target = *t;
cmLocalUnixMakefileGenerator3 *lg3 =
static_cast<cmLocalUnixMakefileGenerator3 *>
(target->GetMakefile()->GetLocalGenerator());
Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- cmGlobalUnixMakefileGenerator3.h 23 Dec 2007 20:03:42 -0000 1.53
+++ cmGlobalUnixMakefileGenerator3.h 31 Jan 2008 03:56:34 -0000 1.54
@@ -114,7 +114,7 @@
const char* config, bool ignoreErrors, bool fast);
// returns some progress informaiton
- int GetTargetTotalNumberOfActions(cmTarget const& target,
+ int GetTargetTotalNumberOfActions(cmTarget & target,
std::set<cmStdString> &emitted);
unsigned long GetNumberOfProgressActionsInAll
(cmLocalUnixMakefileGenerator3 *lg);
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- cmGlobalGenerator.cxx 30 Jan 2008 17:04:37 -0000 1.221
+++ cmGlobalGenerator.cxx 31 Jan 2008 03:56:34 -0000 1.222
@@ -1283,14 +1283,14 @@
clg = clg->GetParent())
{
// This local generator includes the target.
- std::set<cmTarget const*>& targetSet =
+ std::set<cmTarget*>& targetSet =
this->LocalGeneratorToTargetMap[clg];
targetSet.insert(&target);
// Add dependencies of the included target. An excluded
// target may still be included if it is a dependency of a
// non-excluded target.
- TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(target);
+ TargetDependSet & tgtdeps = this->GetTargetDirectDepends(target);
for(TargetDependSet::const_iterator ti = tgtdeps.begin();
ti != tgtdeps.end(); ++ti)
{
@@ -1682,14 +1682,14 @@
}
//----------------------------------------------------------------------------
-cmGlobalGenerator::TargetDependSet const&
-cmGlobalGenerator::GetTargetDirectDepends(cmTarget const& target)
+cmGlobalGenerator::TargetDependSet &
+cmGlobalGenerator::GetTargetDirectDepends(cmTarget & target)
{
// Clarify the role of the input target.
- cmTarget const* depender = ⌖
+ cmTarget * depender = ⌖
// if the depends are already in the map then return
- TargetDependMap::const_iterator tgtI =
+ TargetDependMap::iterator tgtI =
this->TargetDependencies.find(depender);
if(tgtI != this->TargetDependencies.end())
{
@@ -1737,12 +1737,12 @@
//----------------------------------------------------------------------------
bool
-cmGlobalGenerator::ConsiderTargetDepends(cmTarget const* depender,
+cmGlobalGenerator::ConsiderTargetDepends(cmTarget * depender,
TargetDependSet& depender_depends,
const char* dependee_name)
{
// Check the target's makefile first.
- cmTarget const* dependee =
+ cmTarget * dependee =
depender->GetMakefile()->FindTarget(dependee_name);
// Then search globally.
@@ -1758,7 +1758,7 @@
}
// Check whether the depender is among the dependee's dependencies.
- std::vector<cmTarget const*> steps;
+ std::vector<cmTarget *> steps;
if(this->FindDependency(depender, dependee, steps))
{
// This creates a cyclic dependency.
@@ -1769,7 +1769,7 @@
for(unsigned int i = static_cast<unsigned int>(steps.size());
i > 0; --i)
{
- cmTarget const* step = steps[i-1];
+ cmTarget * step = steps[i-1];
e << " -> " << step->GetName() << "\n";
isStatic = isStatic && step->GetType() == cmTarget::STATIC_LIBRARY;
}
@@ -1799,21 +1799,21 @@
//----------------------------------------------------------------------------
bool
cmGlobalGenerator
-::FindDependency(cmTarget const* goal, cmTarget const* current,
- std::vector<cmTarget const*>& steps)
+::FindDependency(cmTarget * goal, cmTarget * current,
+ std::vector<cmTarget*>& steps)
{
if(current == goal)
{
steps.push_back(current);
return true;
}
- TargetDependMap::const_iterator i = this->TargetDependencies.find(current);
+ TargetDependMap::iterator i = this->TargetDependencies.find(current);
if(i == this->TargetDependencies.end())
{
return false;
}
- TargetDependSet const& depends = i->second;
- for(TargetDependSet::const_iterator j = depends.begin();
+ TargetDependSet & depends = i->second;
+ for(TargetDependSet::iterator j = depends.begin();
j != depends.end(); ++j)
{
if(this->FindDependency(goal, *j, steps))
More information about the Cmake-commits
mailing list