aboutsummaryrefslogtreecommitdiffstats
path: root/include/llvm/Object
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2013-08-09 16:48:21 +0000
committerHans Wennborg <hans@hanshq.net>2013-08-09 16:48:21 +0000
commit6c2dc9e66eeec5d39b2e6e53d18a023a5fa0af54 (patch)
tree5b021a5b983d4dd85b0f5d2967b03052e6511c19 /include/llvm/Object
parent27c35d980a4f59ca9a4d75bf219092e6b1013dc9 (diff)
downloadexternal_llvm-6c2dc9e66eeec5d39b2e6e53d18a023a5fa0af54.zip
external_llvm-6c2dc9e66eeec5d39b2e6e53d18a023a5fa0af54.tar.gz
external_llvm-6c2dc9e66eeec5d39b2e6e53d18a023a5fa0af54.tar.bz2
ELFObjectFile.h: Silence warning on Windows
The compiler was warning about using | on a uintptr_t and bool: Object/ELFObjectFile.h(131) : warning C4805: '|' : unsafe mix of type 'uintptr_t' and type 'bool' in operation I think the warning might be useful in other cases, so I added a cast instead of disabling it altogether. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188079 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Object')
-rw-r--r--include/llvm/Object/ELFObjectFile.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h
index f0be8ab..08cac04 100644
--- a/include/llvm/Object/ELFObjectFile.h
+++ b/include/llvm/Object/ELFObjectFile.h
@@ -128,7 +128,8 @@ protected: // ELF specific protected members.
DataRefImpl toDRI(Elf_Sym_Iter Symb) const {
DataRefImpl DRI;
- DRI.p = reinterpret_cast<uintptr_t>(Symb.get()) | Symb.isDynamic();
+ DRI.p = reinterpret_cast<uintptr_t>(Symb.get()) |
+ static_cast<uintptr_t>(Symb.isDynamic());
return DRI;
}