[llvm] r320868 - Fixed the gcc 'enumeral and non-enumeral type in conditional expression [-Werror=extra]' warning introduced by r320750

Galina Kistanova via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 15 14:15:29 PST 2017


Author: gkistanova
Date: Fri Dec 15 14:15:29 2017
New Revision: 320868

URL: http://llvm.org/viewvc/llvm-project?rev=320868&view=rev
Log:
Fixed the gcc 'enumeral and non-enumeral type in conditional expression [-Werror=extra]' warning introduced by r320750

Modified:
    llvm/trunk/lib/Object/COFFImportFile.cpp

Modified: llvm/trunk/lib/Object/COFFImportFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFImportFile.cpp?rev=320868&r1=320867&r2=320868&view=diff
==============================================================================
--- llvm/trunk/lib/Object/COFFImportFile.cpp (original)
+++ llvm/trunk/lib/Object/COFFImportFile.cpp Fri Dec 15 14:15:29 2017
@@ -188,7 +188,7 @@ ObjectFactory::createImportDescriptor(st
           (ImportName.size() + 1)),
       u32(NumberOfSymbols),
       u16(0),
-      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : 0),
+      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : C_Invalid),
   };
   append(Buffer, Header);
 
@@ -324,7 +324,7 @@ ObjectFactory::createNullImportDescripto
           sizeof(coff_import_directory_table_entry)),
       u32(NumberOfSymbols),
       u16(0),
-      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : 0),
+      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : C_Invalid),
   };
   append(Buffer, Header);
 
@@ -387,7 +387,7 @@ NewArchiveMember ObjectFactory::createNu
           VASize),
       u32(NumberOfSymbols),
       u16(0),
-      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : 0),
+      u16(is32bit(Machine) ? IMAGE_FILE_32BIT_MACHINE : C_Invalid),
   };
   append(Buffer, Header);
 




More information about the llvm-commits mailing list