[libcxx] r302071 - Merge r296561 - Fix PR32097 - is_abstract doesn't work on class templates.

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Wed May  3 14:50:39 2017
New Revision: 302071

URL: http://llvm.org/viewvc/llvm-project?rev=302071&view=rev
Log:
Merge r296561 - Fix PR32097 - is_abstract doesn't work on class templates.

Modified:
    libcxx/branches/release_40/include/type_traits
    
libcxx/branches/release_40/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp

Modified: libcxx/branches/release_40/include/type_traits
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/type_traits?rev=302071&r1=302070&r2=302071&view=diff
==============================================================================
--- libcxx/branches/release_40/include/type_traits (original)
+++ libcxx/branches/release_40/include/type_traits Wed May  3 14:50:39 2017
@@ -1297,18 +1297,8 @@ template <class _Tp> using decay_t = typ
 
 // is_abstract
 
-namespace __is_abstract_imp
-{
-template <class _Tp> char  __test(_Tp (*)[1]);
-template <class _Tp> __two __test(...);
-}
-
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_abstract : public integral_constant<bool, 
sizeof(__is_abstract_imp::__test<_Tp>(0)) != 1> {};
-
-template <class _Tp> struct __libcpp_abstract<_Tp, false> : public false_type 
{};
-
-template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_abstract : public 
__libcpp_abstract<_Tp> {};
+template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_abstract
+    : public integral_constant<bool, __is_abstract(_Tp)> {};
 
 #if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
 template <class _Tp> _LIBCPP_CONSTEXPR bool is_abstract_v

Modified: 
libcxx/branches/release_40/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp?rev=302071&r1=302070&r2=302071&view=diff
==============================================================================
--- 
libcxx/branches/release_40/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
 (original)
+++ 
libcxx/branches/release_40/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
 Wed May  3 14:50:39 2017
@@ -65,6 +65,14 @@ class Abstract
     virtual ~Abstract() = 0;
 };
 
+template <class>
+struct AbstractTemplate {
+  virtual void test() = 0;
+};
+
+template <>
+struct AbstractTemplate<double> {};
+
 int main()
 {
     test_is_not_abstract<void>();
@@ -81,4 +89,6 @@ int main()
     test_is_not_abstract<NotEmpty>();
 
     test_is_abstract<Abstract>();
+    test_is_abstract<AbstractTemplate<int> >();
+    test_is_not_abstract<AbstractTemplate<double> >();
 }


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits