[llvm-commits] [llvm] r122419 - /llvm/trunk/lib/MC/MachObjectWriter.cpp

[Matt Beaumont-Gay]

Author: matthewbg
Date: Wed Dec 22 12:25:55 2010
New Revision: 122419

URL: http://llvm.org/viewvc/llvm-project?rev=122419&view=rev
Log:
Fix another conditional expression mismatched enum type warning.

Modified:
    llvm/trunk/lib/MC/MachObjectWriter.cpp

Modified: llvm/trunk/lib/MC/MachObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=122419&r1=122418&r2=122419&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MachObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/MachObjectWriter.cpp Wed Dec 22 12:25:55 2010
@@ -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)