diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-02-01 06:11:58 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-02-01 06:11:58 +0000 |
| commit | e1d61f666b7994a3c421242a6678414bb414a325 (patch) | |
| tree | dba02d2da68ca97c850a155ea31f97ac7eddc5e8 /llvm/lib/Transforms | |
| parent | ee4ab93906027c054088fb248c030d8dd238ddf9 (diff) | |
| download | bcm5719-llvm-e1d61f666b7994a3c421242a6678414bb414a325.tar.gz bcm5719-llvm-e1d61f666b7994a3c421242a6678414bb414a325.zip | |
BBVectorize.cpp: Try to fix MSVC build. map::iterator and multimap::iterator are incompatible.
llvm-svn: 149475
Diffstat (limited to 'llvm/lib/Transforms')
| -rw-r--r-- | llvm/lib/Transforms/Vectorize/BBVectorize.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Vectorize/BBVectorize.cpp b/llvm/lib/Transforms/Vectorize/BBVectorize.cpp index 6d879b79b0c..150468af92f 100644 --- a/llvm/lib/Transforms/Vectorize/BBVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/BBVectorize.cpp @@ -940,7 +940,7 @@ namespace { bool MoreChildren = false; size_t MaxChildDepth = QTop.second; VPPIteratorPair qtRange = ConnectedPairs.equal_range(QTop.first); - for (std::map<ValuePair, ValuePair>::iterator k = qtRange.first; + for (std::multimap<ValuePair, ValuePair>::iterator k = qtRange.first; k != qtRange.second; ++k) { // Make sure that this child pair is still a candidate: bool IsStillCand = false; @@ -997,7 +997,7 @@ namespace { // Visit each child, pruning as necessary... DenseMap<ValuePair, size_t> BestChilden; VPPIteratorPair QTopRange = ConnectedPairs.equal_range(QTop.first); - for (std::map<ValuePair, ValuePair>::iterator K = QTopRange.first; + for (std::multimap<ValuePair, ValuePair>::iterator K = QTopRange.first; K != QTopRange.second; ++K) { DenseMap<ValuePair, size_t>::iterator C = Tree.find(K->second); if (C == Tree.end()) continue; |

