From: Hans Wennborg <hans@hanshq.net>
Date: Fri, 9 Aug 2013 16:48:21 +0000 (+0000)
Subject: ELFObjectFile.h: Silence warning on Windows
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=6c2dc9e66eeec5d39b2e6e53d18a023a5fa0af54

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
---

diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h
index f0be8abb09f..08cac04ac6d 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;
   }