summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-01-14 14:51:58 (GMT)
committerBrad King <brad.king@kitware.com>2009-01-14 14:51:58 (GMT)
commite92d99d05c4edf1a7aae5eee4c66432f9e01d04f (patch)
tree48d5550126470c49a33afeadfdf53c4e5c9f22b3
parentbb2c08546c8ba53792e6de0be6e77149754025a8 (diff)
downloadCMake-e92d99d05c4edf1a7aae5eee4c66432f9e01d04f.zip
CMake-e92d99d05c4edf1a7aae5eee4c66432f9e01d04f.tar.gz
CMake-e92d99d05c4edf1a7aae5eee4c66432f9e01d04f.tar.bz2
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.
-rw-r--r--Source/CTest/cmCTestSubmitHandler.cxx3
-rw-r--r--Source/cmExtraEclipseCDT4Generator.cxx6
2 files changed, 6 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 3a801b6..536efcc 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1128,6 +1128,7 @@ void cmCTestSubmitHandler::SelectParts(std::set<cmCTest::Part> const& parts)
for(cmCTest::Part p = cmCTest::PartStart;
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());
}
}
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index bdf4edc..fcf5b67 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -648,8 +648,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
case cmTarget::GLOBAL_TARGET:
{
bool insertTarget = true;
- if(insertTarget && (this->TargetsToIgnore.find(t->first) !=
- this->TargetsToIgnore.end()))
+ if(insertTarget &&
+ (std::set<std::string>::const_iterator(
+ this->TargetsToIgnore.find(t->first)) !=
+ this->TargetsToIgnore.end()))
{
insertTarget = false;
}