[llvm-commits] [llvm] r149475 - /llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp

NAKAMURA Takumi geek4civic at gmail.com
Tue Jan 31 22:11:58 PST 2012


Author: chapuni
Date: Wed Feb  1 00:11:58 2012
New Revision: 149475

URL: http://llvm.org/viewvc/llvm-project?rev=149475&view=rev
Log:
BBVectorize.cpp: Try to fix MSVC build. map::iterator and multimap::iterator are incompatible.

Modified:
    llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp

Modified: llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp?rev=149475&r1=149474&r2=149475&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp (original)
+++ llvm/trunk/lib/Transforms/Vectorize/BBVectorize.cpp Wed Feb  1 00:11:58 2012
@@ -940,7 +940,7 @@
       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 @@
       // 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;





More information about the llvm-commits mailing list