From c3d48cee49257ea1666986d98c5d268262ad1e9b Mon Sep 17 00:00:00 2001 From: Francois Pichet Date: Wed, 20 Jul 2011 21:35:29 +0000 Subject: Unbreak the MSVC build. Since the "next" function already exists in the MSVC headers, we need the explicit llvm:: qualifier to prevent a conflict. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135623 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/MCFunction.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/llvm-objdump') diff --git a/tools/llvm-objdump/MCFunction.cpp b/tools/llvm-objdump/MCFunction.cpp index dd31402ddc..eef58cd13e 100644 --- a/tools/llvm-objdump/MCFunction.cpp +++ b/tools/llvm-objdump/MCFunction.cpp @@ -95,7 +95,7 @@ MCFunction::createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm, 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 @@ MCFunction::createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm, } } 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); } } -- cgit v1.2.3