From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Wed, 1 Feb 2012 06:11:58 +0000 (+0000)
Subject: BBVectorize.cpp: Try to fix MSVC build. map::iterator and multimap::iterator are... 
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=478eed85f96f0d93da43e26cfb7fc6dee981c9aa

BBVectorize.cpp: Try to fix MSVC build. map::iterator and multimap::iterator are incompatible.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149475 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Vectorize/BBVectorize.cpp b/lib/Transforms/Vectorize/BBVectorize.cpp
index 6d879b79b0c..150468af92f 100644
--- a/lib/Transforms/Vectorize/BBVectorize.cpp
+++ b/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;