summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/MCFunction.cpp
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2011-07-20 21:35:29 +0000
committerFrancois Pichet <pichet2000@gmail.com>2011-07-20 21:35:29 +0000
commit7f023ae4bb23aee53a802d20bee48207b0d8da03 (patch)
tree3b1ed4ba306e9f3d338eaeff853a7b6e13908af3 /llvm/tools/llvm-objdump/MCFunction.cpp
parent350056821a08b5f0ac139dbe85913f68e23384c9 (diff)
downloadbcm5719-llvm-7f023ae4bb23aee53a802d20bee48207b0d8da03.tar.gz
bcm5719-llvm-7f023ae4bb23aee53a802d20bee48207b0d8da03.zip
Unbreak the MSVC build. Since the "next" function already exists in the MSVC headers, we need the explicit llvm:: qualifier to prevent a conflict.
llvm-svn: 135623
Diffstat (limited to 'llvm/tools/llvm-objdump/MCFunction.cpp')
-rw-r--r--llvm/tools/llvm-objdump/MCFunction.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-objdump/MCFunction.cpp b/llvm/tools/llvm-objdump/MCFunction.cpp
index dd31402ddc6..eef58cd13e0 100644
--- a/llvm/tools/llvm-objdump/MCFunction.cpp
+++ b/llvm/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);
}
}
OpenPOWER on IntegriCloud