Fix some -Wreorder issues.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305497 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-pdbutil/FormatUtil.h b/tools/llvm-pdbutil/FormatUtil.h
index 5c9807e33b5a9dd8b3fd128e0ca3dfd4adb518eb..2345bce0f8fea792b203f678c206969528abd1b5 100644 (file)
--- a/tools/llvm-pdbutil/FormatUtil.h
+++ b/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/tools/llvm-pdbutil/MinimalSymbolDumper.h b/tools/llvm-pdbutil/MinimalSymbolDumper.h
index d1851119d3339ba3661f17ab7b36218fbac66ccc..319e4c211cdb864b1397237e005817b301993730 100644 (file)
--- a/tools/llvm-pdbutil/MinimalSymbolDumper.h
+++ b/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/tools/llvm-pdbutil/MinimalTypeDumper.h b/tools/llvm-pdbutil/MinimalTypeDumper.h
index f494aaf61eac0c2f3f72930d6d62b8c10ad6d76b..47f6781e3cabf9bf667e97e0e564fde0cc9cde9f 100644 (file)
--- a/tools/llvm-pdbutil/MinimalTypeDumper.h
+++ b/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;
 };