maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix "enumeral and non-enumeral type in conditional expression" warnings. NFCI. 

llvm-svn: 370892
This commit is contained in:
Simon Pilgrim 2019-09-04 12:51:40 +00:00
parent e8316372b9
commit 92e13f2eab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/tools/llvm-objcopy/CopyConfig.cpp
View File

@ -716,7 +716,7 @@ Expected<DriverConfig> parseObjcopyOptions(ArrayRef<const char *> ArgsArr) {
for (auto Arg : InputArgs.filtered(OBJCOPY_add_symbol)) {
Expected<NewSymbolInfo> NSI = parseNewSymbolInfo(
Arg->getValue(),
Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT));
Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT));
if (!NSI)
return NSI.takeError();
Config.SymbolsToAdd.push_back(*NSI);

2
llvm/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
View File

@ -756,7 +756,7 @@ Error executeObjcopyOnIHex(const CopyConfig &Config, MemoryBuffer &In,
Error executeObjcopyOnRawBinary(const CopyConfig &Config, MemoryBuffer &In,
Buffer &Out) {
uint8_t NewSymbolVisibility =
Config.NewSymbolVisibility.getValueOr(ELF::STV_DEFAULT);
Config.NewSymbolVisibility.getValueOr((uint8_t)ELF::STV_DEFAULT);
BinaryReader Reader(Config.BinaryArch, &In, NewSymbolVisibility);
std::unique_ptr<Object> Obj = Reader.create();