[llvm-commits] [llvm] r172580 - /llvm/trunk/include/llvm/Object/ELF.h

[Dmitri Gribenko]

Author: gribozavr
Date: Tue Jan 15 18:14:15 2013
New Revision: 172580

URL: http://llvm.org/viewvc/llvm-project?rev=172580&view=rev
Log:
Improve r172577 by using the correct type when declaring constants

Modified:
    llvm/trunk/include/llvm/Object/ELF.h

Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=172580&r1=172579&r2=172580&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Tue Jan 15 18:14:15 2013
@@ -37,11 +37,9 @@
 
 template<endianness target_endianness, std::size_t max_alignment, bool is64Bits>
 struct ELFType {
-  enum {
-    TargetEndianness = target_endianness,
-    MaxAlignment = max_alignment,
-    Is64Bits = is64Bits
-  };
+  static const endianness TargetEndianness = target_endianness;
+  static const std::size_t MaxAlignment = max_alignment;
+  static const bool Is64Bits = is64Bits;
 };
 
 template<typename T, int max_align>
@@ -792,8 +790,7 @@
   // Methods for type inquiry through isa, cast, and dyn_cast
   bool isDyldType() const { return isDyldELFObject; }
   static inline bool classof(const Binary *v) {
-    return v->getType() == getELFType(static_cast<int>(ELFT::TargetEndianness)
-                                      == static_cast<int>(support::little),
+    return v->getType() == getELFType(ELFT::TargetEndianness == support::little,
                                       ELFT::Is64Bits);
   }
 };
@@ -2380,8 +2377,7 @@
   case ELF::EM_HEXAGON:
     return Triple::hexagon;
   case ELF::EM_MIPS:
-    return (static_cast<int>(ELFT::TargetEndianness)
-            == static_cast<int>(support::little)) ?
+    return (ELFT::TargetEndianness == support::little) ?
            Triple::mipsel : Triple::mips;
   case ELF::EM_PPC64:
     return Triple::ppc64;