diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-21 21:07:31 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-21 21:07:31 +0000 |
| commit | 88dddf9198962c67c3f2e3f0b5ed607b59f0b246 (patch) | |
| tree | eeacbcd79924ba0d5ccc5d7cd3c1a37a1c972c78 | |
| parent | c1a269bf0e0aec0ccb1f3d754105cf5561e79501 (diff) | |
| download | bcm5719-llvm-88dddf9198962c67c3f2e3f0b5ed607b59f0b246.tar.gz bcm5719-llvm-88dddf9198962c67c3f2e3f0b5ed607b59f0b246.zip | |
Drop remaining uses of the Base typedef idiom.
llvm-svn: 256200
| -rw-r--r-- | lld/ELF/Symbols.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h index 053aea0d49e..b388bcf246a 100644 --- a/lld/ELF/Symbols.h +++ b/lld/ELF/Symbols.h @@ -153,11 +153,9 @@ public: // The base class for any defined symbols, including absolute symbols, etc. template <class ELFT> class Defined : public ELFSymbolBody<ELFT> { - typedef ELFSymbolBody<ELFT> Base; - protected: typedef typename SymbolBody::Kind Kind; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; public: Defined(Kind K, StringRef N, const Elf_Sym &Sym) @@ -167,8 +165,7 @@ public: }; template <class ELFT> class DefinedAbsolute : public Defined<ELFT> { - typedef ELFSymbolBody<ELFT> Base; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; public: static Elf_Sym IgnoreUndef; @@ -212,8 +209,7 @@ template <class ELFT> typename DefinedAbsolute<ELFT>::Elf_Sym DefinedAbsolute<ELFT>::RelaIpltEnd; template <class ELFT> class DefinedCommon : public Defined<ELFT> { - typedef ELFSymbolBody<ELFT> Base; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; public: typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t; @@ -236,8 +232,7 @@ public: // Regular defined symbols read from object file symbol tables. template <class ELFT> class DefinedRegular : public Defined<ELFT> { - typedef Defined<ELFT> Base; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; public: DefinedRegular(StringRef N, const Elf_Sym &Sym, @@ -257,10 +252,8 @@ public: // don't belong to any input files or sections. Thus, its constructor // takes an output section to calculate output VA, etc. template <class ELFT> class DefinedSynthetic : public Defined<ELFT> { - typedef Defined<ELFT> Base; - public: - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; DefinedSynthetic(StringRef N, const Elf_Sym &Sym, OutputSectionBase<ELFT> &Section) : Defined<ELFT>(SymbolBody::DefinedSyntheticKind, N, Sym), @@ -275,8 +268,7 @@ public: // Undefined symbol. template <class ELFT> class Undefined : public ELFSymbolBody<ELFT> { - typedef ELFSymbolBody<ELFT> Base; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; public: static Elf_Sym Required; @@ -298,8 +290,7 @@ template <class ELFT> typename Undefined<ELFT>::Elf_Sym Undefined<ELFT>::Optional; template <class ELFT> class SharedSymbol : public Defined<ELFT> { - typedef Defined<ELFT> Base; - typedef typename Base::Elf_Sym Elf_Sym; + typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym; typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t; public: |
