commit 40b31ad3ee520ad263387d8c0a8a9924bdeb9282
author Oscar Fuentes <ofv@wanadoo.es> Mon Aug 02 06:00:15 2010 +0000
committer Oscar Fuentes <ofv@wanadoo.es> Mon Aug 02 06:00:15 2010 +0000
tree c852558e2b4d82c29d280317df525f5cfb1b807f
parent 71c723da296f8252d04bb639005edf9c247fba90

Prefix `next' iterator operation with `llvm::'.

Fixes potential ambiguity problems on VS 2010.

Patch by nobled!

llvm-svn: 110029

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 1dce55f..65f5edc 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -5898,7 +5898,7 @@
       for (MachineSDNode::mmo_iterator i = MN->memoperands_begin(),
            e = MN->memoperands_end(); i != e; ++i) {
         OS << **i;
-        if (next(i) != e)
+        if (llvm::next(i) != e)
           OS << " ";
       }
       OS << ">";