diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-07-20 21:35:29 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-07-20 21:35:29 +0000 |
| commit | c3d48cee49257ea1666986d98c5d268262ad1e9b (patch) | |
| tree | 6dfd6eaa6a3e2d0a699965073b3f8d8b18ea94e6 /tools/llvm-objdump | |
| parent | 1769a3df4a81309ec055a8586c8ac35755fa79a2 (diff) | |
| download | external_llvm-c3d48cee49257ea1666986d98c5d268262ad1e9b.zip external_llvm-c3d48cee49257ea1666986d98c5d268262ad1e9b.tar.gz external_llvm-c3d48cee49257ea1666986d98c5d268262ad1e9b.tar.bz2 | |
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
Diffstat (limited to 'tools/llvm-objdump')
| -rw-r--r-- | tools/llvm-objdump/MCFunction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/llvm-objdump/MCFunction.cpp b/tools/llvm-objdump/MCFunction.cpp index dd31402..eef58cd 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); } } |