summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-01-27 20:09:58 (GMT)
committerBrad King <brad.king@kitware.com>2008-01-27 20:09:58 (GMT)
commit8f9798061525da510b801d53051c60e882bd84e1 (patch)
tree985fee8043bef7fd69dc6fa9d3097072d8647e25
parent99b97dece82ccfc940b60e3cdb01a0368464629f (diff)
downloadCMake-8f9798061525da510b801d53051c60e882bd84e1.zip
CMake-8f9798061525da510b801d53051c60e882bd84e1.tar.gz
CMake-8f9798061525da510b801d53051c60e882bd84e1.tar.bz2
COMP: Use kwsys to get STL set_intersection algorithm.
-rw-r--r--Source/cmComputeLinkDepends.cxx8
-rwxr-xr-xbootstrap2
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index bf2b1c5..6056431 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -21,7 +21,7 @@
#include "cmMakefile.h"
#include "cmTarget.h"
-#include <algorithm>
+#include <cmsys/stl/algorithm>
/*
@@ -397,9 +397,9 @@ void cmComputeLinkDepends::InferDependencies()
for(++i; i != sets->end(); ++i)
{
DependSet intersection;
- set_intersection(common.begin(), common.end(),
- i->begin(), i->end(),
- std::inserter(intersection, intersection.begin()));
+ cmsys_stl::set_intersection
+ (common.begin(), common.end(), i->begin(), i->end(),
+ std::inserter(intersection, intersection.begin()));
common = intersection;
}
diff --git a/bootstrap b/bootstrap
index ad10eed..e08dc01 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1213,7 +1213,7 @@ cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_stl.hxx.in" \
cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" \
"${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" KWSYS_NAMESPACE cmsys
-for a in string vector map; do
+for a in string vector map algorithm; do
cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" \
"${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
done