[lld] r227297 - [Mips] Fix enumeral and non-enumeral type in conditional expression warning

[Simon Atanasyan]

Author: atanasyan
Date: Wed Jan 28 00:23:15 2015
New Revision: 227297

URL: http://llvm.org/viewvc/llvm-project?rev=227297&view=rev
Log:
[Mips] Fix enumeral and non-enumeral type in conditional expression warning

No functional changes.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp?rev=227297&r1=227296&r2=227297&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp Wed Jan 28 00:23:15 2015
@@ -71,7 +71,7 @@ std::error_code MipsELFFlagsMerger::merg
   // We support two ABI: O32 and N64. The last one does not have
   // the corresponding ELF flag.
   uint32_t inAbi = newFlags & EF_MIPS_ABI;
-  uint32_t supportedAbi = _is64Bit ? 0 : EF_MIPS_ABI_O32;
+  uint32_t supportedAbi = _is64Bit ? 0 : uint32_t(EF_MIPS_ABI_O32);
   if (inAbi != supportedAbi)
     return make_dynamic_error_code(Twine("Unsupported ABI"));