Move uintX_t typedef to the class definition. NFC.

Now it is doable because LinkerScript is a template class.

llvm-svn: 267212

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 1cfe358..aae7507 100644 (file)
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -217,8 +217,6 @@ findSection(ArrayRef<OutputSectionBase<ELFT> *> V, StringRef Name) {
 template <class ELFT>
 void LinkerScript<ELFT>::assignAddresses(
     ArrayRef<OutputSectionBase<ELFT> *> Sections) {
-  typedef typename ELFT::uint uintX_t;
-
   // Orphan sections are sections present in the input files which
   // are not explicitly placed into the output file by the linker script.
   // We place orphan sections at end of file.

diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index 25c668f..a05787d 100644 (file)
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -75,6 +75,8 @@ extern ScriptConfiguration *ScriptConfig;
 
 // This is a runner of the linker script.
 template <class ELFT> class LinkerScript {
+  typedef typename ELFT::uint uintX_t;
+
 public:
   StringRef getOutputSection(InputSectionBase<ELFT> *S);
   ArrayRef<uint8_t> getFiller(StringRef Name);
@@ -94,7 +96,7 @@ private:
   uint64_t parsePrimary(ArrayRef<StringRef> &Tokens);
   uint64_t parseExpr1(ArrayRef<StringRef> &Tokens, uint64_t Lhs, int MinPrec);
   uint64_t parseTernary(ArrayRef<StringRef> &Tokens, uint64_t Cond);
-  typename ELFT::uint Dot;
+  uintX_t Dot;
 };
 
 // Variable template is a C++14 feature, so we can't template