[llvm] r210450 - Fix gcc warning (enumeral and non-enumeral type in conditional expression)

[Patrik Hagglund]

Author: patha
Date: Mon Jun  9 02:35:07 2014
New Revision: 210450

URL: http://llvm.org/viewvc/llvm-project?rev=210450&view=rev
Log:
Fix gcc warning (enumeral and non-enumeral type in conditional expression)

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

Modified: llvm/trunk/lib/MC/MCObjectFileInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=210450&r1=210449&r2=210450&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCObjectFileInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCObjectFileInfo.cpp Mon Jun  9 02:35:07 2014
@@ -584,7 +584,8 @@ void MCObjectFileInfo::InitCOFFMCObjectF
                         SectionKind::getBSS());
   TextSection =
     Ctx->getCOFFSection(".text",
-                        (IsWoA ? COFF::IMAGE_SCN_MEM_16BIT : 0) |
+                        (IsWoA ? COFF::IMAGE_SCN_MEM_16BIT
+                               : (COFF::SectionCharacteristics)0) |
                         COFF::IMAGE_SCN_CNT_CODE |
                         COFF::IMAGE_SCN_MEM_EXECUTE |
                         COFF::IMAGE_SCN_MEM_READ,