kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Constify some cmSourceGroup related code.

This commit is contained in:
Stephen Kelly 2014-01-21 15:16:43 +01:00
parent e68a3eadff
commit fe8b0330eb
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -2114,19 +2114,20 @@ cmSourceFile *cmMakefile::GetSourceFileWithOutput(const char *cname)
} }
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
cmSourceGroup* cmMakefile::GetSourceGroup(const std::vector<std::string>&name) cmSourceGroup*
cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
{ {
cmSourceGroup* sg = 0; cmSourceGroup* sg = 0;
// first look for source group starting with the same as the one we wants // first look for source group starting with the same as the one we wants
for (std::vector<cmSourceGroup>::iterator sgIt = this->SourceGroups.begin(); for (std::vector<cmSourceGroup>::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt) sgIt != this->SourceGroups.end(); ++sgIt)
{ {
std::string sgName = sgIt->GetName(); std::string sgName = sgIt->GetName();
if(sgName == name[0]) if(sgName == name[0])
{ {
sg = &(*sgIt); sg = const_cast<cmSourceGroup*>(&(*sgIt));
break; break;
} }
} }

2
Source/cmMakefile.h
View File

@ -639,7 +639,7 @@ public:
/** /**
* Get the source group * Get the source group
*/ */
cmSourceGroup* GetSourceGroup(const std::vector<std::string>&name); cmSourceGroup* GetSourceGroup(const std::vector<std::string>&name) const;
#endif #endif
/** /**

8
Source/cmSourceGroup.cxx
View File

@ -126,12 +126,12 @@ void cmSourceGroup::AddChild(cmSourceGroup child)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmSourceGroup *cmSourceGroup::lookupChild(const char* name) cmSourceGroup *cmSourceGroup::lookupChild(const char* name) const
{ {
// initializing iterators // initializing iterators
std::vector<cmSourceGroup>::iterator iter = std::vector<cmSourceGroup>::const_iterator iter =
this->Internal->GroupChildren.begin(); this->Internal->GroupChildren.begin();
std::vector<cmSourceGroup>::iterator end = const std::vector<cmSourceGroup>::const_iterator end =
this->Internal->GroupChildren.end(); this->Internal->GroupChildren.end();
// st // st
@ -142,7 +142,7 @@ cmSourceGroup *cmSourceGroup::lookupChild(const char* name)
// look if descenened is the one were looking for // look if descenened is the one were looking for
if(sgName == name) if(sgName == name)
{ {
return &(*iter); // if it so return it return const_cast<cmSourceGroup*>(&(*iter)); // if it so return it
} }
} }

2
Source/cmSourceGroup.h
View File

@ -56,7 +56,7 @@ public:
/** /**
* Looks up child and returns it * Looks up child and returns it
*/ */
cmSourceGroup *lookupChild(const char *name); cmSourceGroup *lookupChild(const char *name) const;
/** /**
* Get the name of this group. * Get the name of this group.