From 6be68525d08bb6f4f4836258b22645716a7b9579 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Wed, 16 Dec 2015 23:49:19 +0000
Subject: [PATCH] Typedef uintX_t at beginning of a function just like others.

llvm-svn: 255853
---
 lld/ELF/Symbols.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp
index 9a9098bad965..d9eb5a528e6c 100644
--- a/lld/ELF/Symbols.cpp
+++ b/lld/ELF/Symbols.cpp
@@ -32,6 +32,7 @@ static uint8_t getMinVisibility(uint8_t VA, uint8_t VB) {
 // Returns 1, 0 or -1 if this symbol should take precedence
 // over the Other, tie or lose, respectively.
 template <class ELFT> int SymbolBody::compare(SymbolBody *Other) {
+  typedef typename ELFFile<ELFT>::uintX_t uintX_t;
   assert(!isLazy() && !Other->isLazy());
   std::pair<bool, bool> L(isDefined(), !isWeak());
   std::pair<bool, bool> R(Other->isDefined(), !Other->isWeak());
@@ -59,13 +60,12 @@ template <class ELFT> int SymbolBody::compare(SymbolBody *Other) {
       return -1;
     auto *ThisC = cast<DefinedCommon<ELFT>>(this);
     auto *OtherC = cast<DefinedCommon<ELFT>>(Other);
-    typename DefinedCommon<ELFT>::uintX_t MaxAlign =
-        std::max(ThisC->MaxAlignment, OtherC->MaxAlignment);
+    uintX_t Align = std::max(ThisC->MaxAlignment, OtherC->MaxAlignment);
     if (ThisC->Sym.st_size >= OtherC->Sym.st_size) {
-      ThisC->MaxAlignment = MaxAlign;
+      ThisC->MaxAlignment = Align;
       return 1;
     }
-    OtherC->MaxAlignment = MaxAlign;
+    OtherC->MaxAlignment = Align;
     return -1;
   }
   if (Other->isCommon())
-- 
2.34.1