[libcxx] r298438 - Fix test failure I introduced

Marshall Clow via cfe-commits cfe-commits at lists.llvm.org
Tue Mar 21 14:05:28 PDT 2017


Author: marshall
Date: Tue Mar 21 16:05:28 2017
New Revision: 298438

URL: http://llvm.org/viewvc/llvm-project?rev=298438&view=rev
Log:
Fix test failure I introduced

Modified:
    libcxx/trunk/include/type_traits

Modified: libcxx/trunk/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=298438&r1=298437&r2=298438&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Tue Mar 21 16:05:28 2017
@@ -1947,18 +1947,18 @@ template <class _Tp> using make_unsigned
 
 #ifdef _LIBCPP_HAS_NO_VARIADICS
 
-template <>
-struct _LIBCPP_TEMPLATE_VIS common_type<void, void, void>
+template <class _Tp, class _Up = void, class _Vp = void>
+struct _LIBCPP_TEMPLATE_VIS common_type
 {
 public:
-    typedef void type;
+    typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp>::type type;
 };
 
-template <class _Tp, class _Up = void, class _Vp = void>
-struct _LIBCPP_TEMPLATE_VIS common_type
+template <>
+struct _LIBCPP_TEMPLATE_VIS common_type<void, void, void>
 {
 public:
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp>::type type;
+    typedef void type;
 };
 
 template <class _Tp>




More information about the cfe-commits mailing list