RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-15 07:39:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unbreak the MSVC build. Since the "next" function already exists in the MSVC headers, we need the explicit llvm:: qualifier to prevent a conflict.

Browse Source 
llvm-svn: 135623
This commit is contained in:
Francois Pichet 2011-07-20 21:35:29 +00:00
parent fbaaa3ae98
commit 1b727ad694
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/llvm-objdump/MCFunction.cpp
View File

@ -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);
}
}