[llvm] r280304 - Fix the MSVC 2013 build by using Elf_Word instead of making a local typedef

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Aug 31 17:45:36 2016
New Revision: 280304

URL: http://llvm.org/viewvc/llvm-project?rev=280304&view=rev
Log:
Fix the MSVC 2013 build by using Elf_Word instead of making a local typedef

Modified:
    llvm/trunk/tools/llvm-readobj/ELFDumper.cpp

Modified: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ELFDumper.cpp?rev=280304&r1=280303&r2=280304&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp Wed Aug 31 17:45:36 2016
@@ -3240,8 +3240,6 @@ void GNUStyle<ELFT>::printNotes(const EL
 
   auto process = [&](const typename ELFFile<ELFT>::Elf_Off Offset,
                      const typename ELFFile<ELFT>::Elf_Addr Size) {
-    typedef typename ELFFile<ELFT>::Elf_Word Word;
-
     if (Size <= 0)
       return;
 
@@ -3253,14 +3251,14 @@ void GNUStyle<ELFT>::printNotes(const EL
        << "  Owner                 Data size\tDescription\n";
 
     while (P < E) {
-      const Word *Words = reinterpret_cast<const Word *>(&P[0]);
+      const Elf_Word *Words = reinterpret_cast<const Elf_Word *>(&P[0]);
 
       uint32_t NameSize = Words[0];
       uint32_t DescriptorSize = Words[1];
       uint32_t Type = Words[2];
 
-      ArrayRef<Word> Descriptor(&Words[3 + (alignTo<4>(NameSize) / 4)],
-                                alignTo<4>(DescriptorSize) / 4);
+      ArrayRef<Elf_Word> Descriptor(&Words[3 + (alignTo<4>(NameSize) / 4)],
+                                    alignTo<4>(DescriptorSize) / 4);
 
       StringRef Name;
       if (NameSize)
@@ -3276,7 +3274,7 @@ void GNUStyle<ELFT>::printNotes(const EL
       }
       OS << '\n';
 
-      P = P + 3 * sizeof(Word) * alignTo<4>(NameSize) +
+      P = P + 3 * sizeof(Elf_Word) * alignTo<4>(NameSize) +
           alignTo<4>(DescriptorSize);
     }
   };