From: Aaron Ballman <aaron@aaronballman.com>
Date: Thu, 29 Jan 2015 16:02:06 +0000 (+0000)
Subject: Attempting to fix a build issue with MSVC 2012; NFC
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9ee155b80020791c31cd17b044a6a7687bc724c9;p=oota-llvm.git

Attempting to fix a build issue with MSVC 2012; NFC

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

diff --git a/tools/llvm-pdbdump/COMExtras.h b/tools/llvm-pdbdump/COMExtras.h
index 913d179ce41..f77b4932296 100644
--- a/tools/llvm-pdbdump/COMExtras.h
+++ b/tools/llvm-pdbdump/COMExtras.h
@@ -20,7 +20,7 @@ namespace llvm {
 
 template <typename F> struct function_traits;
 
-#if LLVM_HAS_VARIADIC_TEMPLATES
+#if 0 && LLVM_HAS_VARIADIC_TEMPLATES
 template <typename R, typename... Args>
 struct function_traits<R (*)(Args...)> : public function_traits<R(Args...)> {};
 
@@ -37,13 +37,15 @@ struct function_traits<R (__stdcall C::*)(Args...)> {
 // exclusively.
 template <typename C, typename R, typename A1, typename A2, typename A3>
 struct function_traits<R (__stdcall C::*)(A1, A2, A3)> {
-  using args_tuple = std::tuple<A1, A2, A3>;
+  //using args_tuple = std::tuple<A1, A2, A3>;
+  typedef std::tuple<A1, A2, A3> args_tuple;
 };
 
 template <typename C, typename R, typename A1, typename A2, typename A3,
           typename A4, typename A5>
 struct function_traits<R (__stdcall C::*)(A1, A2, A3, A4, A5)> {
-  using args_tuple = std::tuple<A1, A2, A3, A4, A5>;
+  //using args_tuple = std::tuple<A1, A2, A3, A4, A5>;
+  typedef std::tuple<A1, A2, A3, A4, A5> args_tuple;
 };
 #endif