From 635c2c4378c0ad112899810cb39248d4cc95e0cb Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Sat, 7 Feb 2015 02:02:23 +0000
Subject: [PATCH] Change RHS-style decltype to LHS-style decltype<declval()>.

Seems some compilers don't like the RHS-style decltype specifier.

This should fix the buildbots.

llvm-svn: 228484
---
 llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h | 2 +-
 llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h     | 2 +-
 llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h           | 2 +-
 llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h             | 2 +-
 llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp                 | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
index 191e2b9..56dfc73 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
@@ -45,6 +45,6 @@ public:
   }
 };
 
-}; // namespace llvm
+} // namespace llvm
 
 #endif // LLVM_DEBUGINFO_PDB_PDBFUNCTION_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h
index 6ffa829..dd833bd 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h
@@ -29,6 +29,6 @@ public:
   }
 };
 
-}; // namespace llvm
+} // namespace llvm
 
 #endif // LLVM_DEBUGINFO_PDB_PDBSYMBOLCOMPILANDENV_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h
index 7467979..0d95b87 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h
@@ -33,6 +33,6 @@ public:
   }
 };
 
-}; // namespace llvm
+} // namespace llvm
 
 #endif // LLVM_DEBUGINFO_PDB_PDBSYMBOLCUSTOM_H
diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h
index c98de6a..64f0f76 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h
@@ -51,6 +51,6 @@ public:
   }
 };
 
-}; // namespace llvm
+} // namespace llvm
 
 #endif // LLVM_DEBUGINFO_PDB_PDBSYMBOLDATA_H
diff --git a/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp b/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
index d8dbb7a..c12e60a 100644
--- a/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
+++ b/llvm/unittests/DebugInfo/PDB/PDBApiTest.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <type_traits>
 #include <unordered_map>
 
 #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
@@ -60,7 +61,7 @@ namespace std {
 namespace {
 
 #define MOCK_SYMBOL_ACCESSOR(Func)                                             \
-  auto Func() const->decltype(((IPDBRawSymbol *)nullptr)->Func()) override {   \
+  decltype(std::declval<IPDBRawSymbol>().Func()) Func() const override {       \
     typedef decltype(IPDBRawSymbol::Func()) ReturnType;                        \
     return ReturnType();                                                       \
   }
-- 
2.7.4