From e92d99d05c4edf1a7aae5eee4c66432f9e01d04f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 14 Jan 2009 09:51:58 -0500 Subject: 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. --- Source/CTest/cmCTestSubmitHandler.cxx | 3 ++- Source/cmExtraEclipseCDT4Generator.cxx | 6 ++++-- 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 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::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::const_iterator( + this->TargetsToIgnore.find(t->first)) != + this->TargetsToIgnore.end())) { insertTarget = false; } -- cgit v0.12