From 79bda47900a5e5fbb25aed1b3cd83676faaddcfe Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Thu, 15 Jun 2017 19:45:25 +0000
Subject: [PATCH] Fix some -Wreorder issues.

llvm-svn: 305497
---
 llvm/tools/llvm-pdbutil/FormatUtil.h          | 2 +-
 llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h | 1 -
 llvm/tools/llvm-pdbutil/MinimalTypeDumper.h   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/llvm/tools/llvm-pdbutil/FormatUtil.h b/llvm/tools/llvm-pdbutil/FormatUtil.h
index 5c9807e33b5a..2345bce0f8fe 100644
--- a/llvm/tools/llvm-pdbutil/FormatUtil.h
+++ b/llvm/tools/llvm-pdbutil/FormatUtil.h
@@ -33,7 +33,7 @@ namespace pdb {
 
 template <typename T> static std::string formatUnknownEnum(T Value) {
   return formatv("unknown ({0})",
-                 static_cast<std::underlying_type<T>::type>(Value))
+                 static_cast<typename std::underlying_type<T>::type>(Value))
       .str();
 }
 
diff --git a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
index d1851119d333..319e4c211cdb 100644
--- a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
+++ b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
@@ -38,7 +38,6 @@ public:
 private:
   std::string typeIndex(codeview::TypeIndex TI) const;
 
-  uint32_t Width;
   LinePrinter &P;
   bool RecordBytes = false;
   codeview::LazyRandomTypeCollection &Types;
diff --git a/llvm/tools/llvm-pdbutil/MinimalTypeDumper.h b/llvm/tools/llvm-pdbutil/MinimalTypeDumper.h
index f494aaf61eac..47f6781e3cab 100644
--- a/llvm/tools/llvm-pdbutil/MinimalTypeDumper.h
+++ b/llvm/tools/llvm-pdbutil/MinimalTypeDumper.h
@@ -45,8 +45,8 @@ public:
 private:
   StringRef getTypeName(codeview::TypeIndex TI) const;
 
-  uint32_t Width;
   LinePrinter &P;
+  uint32_t Width;
   bool RecordBytes = false;
   codeview::LazyRandomTypeCollection &Types;
 };