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

COMP: Fix const set find for Borland 5.5 

The Borland 5.5 compiler's STL set does not define correct signatures
for its find() members, leading to build errors.  This works around the
problem.
This commit is contained in:
Brad King 2009-01-14 09:51:58 -05:00
parent bb2c08546c
commit e92d99d05c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CTest/cmCTestSubmitHandler.cxx
View File

@ -1128,6 +1128,7 @@ void cmCTestSubmitHandler::SelectParts(std::set<cmCTest::Part> const& parts)
for(cmCTest::Part p = cmCTest::PartStart; for(cmCTest::Part p = cmCTest::PartStart;
p != cmCTest::PartCount; p = cmCTest::Part(p+1)) p != cmCTest::PartCount; p = cmCTest::Part(p+1))
{ {
this->SubmitPart[p] = (parts.find(p) != parts.end()); this->SubmitPart[p] =
(std::set<cmCTest::Part>::const_iterator(parts.find(p)) != parts.end());
} }
} }

6
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -648,8 +648,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
case cmTarget::GLOBAL_TARGET: case cmTarget::GLOBAL_TARGET:
{ {
bool insertTarget = true; bool insertTarget = true;
if(insertTarget && (this->TargetsToIgnore.find(t->first) != if(insertTarget &&
this->TargetsToIgnore.end())) (std::set<std::string>::const_iterator(
this->TargetsToIgnore.find(t->first)) !=
this->TargetsToIgnore.end()))
{ {
insertTarget = false; insertTarget = false;
} }