[lld] r263471 - Revert r263366: Cosmetic change to reduce repetitions. NFC.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Mon Mar 14 14:37:58 2016
New Revision: 263471

URL: http://llvm.org/viewvc/llvm-project?rev=263471&view=rev
Log:
Revert r263366: Cosmetic change to reduce repetitions. NFC.

This reverts commit r263366 because it caused link errors in some linkers.

Modified:
    lld/trunk/ELF/Symbols.h

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=263471&r1=263470&r2=263471&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Mon Mar 14 14:37:58 2016
@@ -46,8 +46,6 @@ struct Symbol {
 
 // The base class for real symbol classes.
 class SymbolBody {
-  template <class ELFT> using ELFFile = llvm::object::ELFFile<ELFT>;
-
 public:
   enum Kind {
     DefinedFirst,
@@ -92,13 +90,17 @@ public:
   bool isInGot() const { return GotIndex != -1U; }
   bool isInPlt() const { return PltIndex != -1U; }
 
-  template <class ELFT> typename ELFFile<ELFT>::uintX_t
-  getVA(typename ELFFile<ELFT>::uintX_t Addend = 0) const;
-
-  template <class ELFT> typename ELFFile<ELFT>::uintX_t getGotVA() const;
-  template <class ELFT> typename ELFFile<ELFT>::uintX_t getGotPltVA() const;
-  template <class ELFT> typename ELFFile<ELFT>::uintX_t getPltVA() const;
-  template <class ELFT> typename ELFFile<ELFT>::uintX_t getSize() const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t
+  getVA(typename llvm::object::ELFFile<ELFT>::uintX_t Addend = 0) const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t getGotVA() const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t getGotPltVA() const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t getPltVA() const;
+  template <class ELFT>
+  typename llvm::object::ELFFile<ELFT>::uintX_t getSize() const;
 
   // A SymbolBody has a backreference to a Symbol. Originally they are
   // doubly-linked. A backreference will never change. But the pointer