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

COMP: Use kwsys to get STL set_intersection algorithm.

This commit is contained in:
Brad King 2008-01-27 15:09:58 -05:00
parent 99b97dece8
commit 8f97980615
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmComputeLinkDepends.cxx
View File

@ -21,7 +21,7 @@
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmTarget.h" #include "cmTarget.h"
#include <algorithm> #include <cmsys/stl/algorithm>
/* /*
@ -397,9 +397,9 @@ void cmComputeLinkDepends::InferDependencies()
for(++i; i != sets->end(); ++i) for(++i; i != sets->end(); ++i)
{ {
DependSet intersection; DependSet intersection;
set_intersection(common.begin(), common.end(), cmsys_stl::set_intersection
i->begin(), i->end(), (common.begin(), common.end(), i->begin(), i->end(),
std::inserter(intersection, intersection.begin())); std::inserter(intersection, intersection.begin()));
common = intersection; common = intersection;
} }

2
bootstrap
View File

@ -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_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" \
"${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" KWSYS_NAMESPACE cmsys "${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_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" \
"${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a} "${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
done done