commit 6b5d2519b3929e0b0aa1ae27a90b8f682366446e
author Matt Beaumont-Gay <matthewbg@google.com> Wed Dec 22 18:25:55 2010 +0000
committer Matt Beaumont-Gay <matthewbg@google.com> Wed Dec 22 18:25:55 2010 +0000
tree c681ac1c7327590d9f2c9a517c870e5790787956
parent 7baabefa030a9d9fbc9766f2229877b09e03cc2d

Fix another conditional expression mismatched enum type warning.

llvm-svn: 122419

llvm/lib/MC/MachObjectWriter.cpp

diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index cab6452..13474277 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -1007,7 +1007,8 @@
         FixedValue -= getSectionAddress(Fragment->getParent());
 
       // Determine the appropriate type based on the fixup kind.
-      Type = Is24BitBranch ? macho::RIT_ARM_Branch24Bit : macho::RIT_Vanilla;
+      Type = Is24BitBranch ? (unsigned)macho::RIT_ARM_Branch24Bit :
+        (unsigned)macho::RIT_Vanilla;
     }
 
     // struct relocation_info (8 bytes)