[llvm] r227456 - Attempting to fix a build issue with MSVC 2012; NFC

Aaron Ballman aaron at aaronballman.com
Thu Jan 29 08:02:06 PST 2015


Author: aaronballman
Date: Thu Jan 29 10:02:06 2015
New Revision: 227456

URL: http://llvm.org/viewvc/llvm-project?rev=227456&view=rev
Log:
Attempting to fix a build issue with MSVC 2012; NFC

Modified:
    llvm/trunk/tools/llvm-pdbdump/COMExtras.h

Modified: llvm/trunk/tools/llvm-pdbdump/COMExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/COMExtras.h?rev=227456&r1=227455&r2=227456&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/COMExtras.h (original)
+++ llvm/trunk/tools/llvm-pdbdump/COMExtras.h Thu Jan 29 10:02:06 2015
@@ -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::*
 // 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
 





More information about the llvm-commits mailing list