[llvm-commits] [llvm] r135623 - /llvm/trunk/tools/llvm-objdump/MCFunction.cpp

[Francois Pichet]

Author: fpichet
Date: Wed Jul 20 16:35:29 2011
New Revision: 135623

URL: http://llvm.org/viewvc/llvm-project?rev=135623&view=rev
Log:
Unbreak the MSVC build. Since the "next" function already exists in the MSVC headers, we need the explicit llvm:: qualifier to prevent a conflict.

Modified:
    llvm/trunk/tools/llvm-objdump/MCFunction.cpp

Modified: llvm/trunk/tools/llvm-objdump/MCFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MCFunction.cpp?rev=135623&r1=135622&r2=135623&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MCFunction.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MCFunction.cpp Wed Jul 20 16:35:29 2011
@@ -95,7 +95,7 @@
           BB.addSucc(&f.getBlockAtAddress(Inst.Address+Inst.Size+Imm));
         // Conditional branches can also fall through to the next block.
         if (Desc.isConditionalBranch() && llvm::next(i) != e)
-          BB.addSucc(&next(i)->second);
+          BB.addSucc(&llvm::next(i)->second);
       } else {
         // Indirect branch. Bail and add all blocks of the function as a
         // successor.
@@ -104,8 +104,8 @@
       }
     } else {
       // No branch. Fall through to the next block.
-      if (!Desc.isReturn() && next(i) != e)
-        BB.addSucc(&next(i)->second);
+      if (!Desc.isReturn() && llvm::next(i) != e)
+        BB.addSucc(&llvm::next(i)->second);
     }
   }