Author: epilk Date: Thu May 25 11:16:17 2017 New Revision: 303878 URL: http://llvm.org/viewvc/llvm-project?rev=303878&view=rev Log: Fix a test that was failing in C++11 mode introduced in r303874
Modified: libcxx/trunk/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp Modified: libcxx/trunk/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp?rev=303878&r1=303877&r2=303878&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp (original) +++ libcxx/trunk/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp Thu May 25 11:16:17 2017 @@ -1,3 +1,5 @@ +// UNSUPPORTED: c++98, c++03 + #include <memory> template <int> struct Tag {}; @@ -21,7 +23,9 @@ struct Deleter { void operator()(Tp) const { using RawT = typename std::remove_pointer<Tp>::type; static_assert(std::is_function<RawT>::value || - std::is_null_pointer<RawT>::value, ""); + std::is_same<typename std::remove_cv<RawT>::type, + std::nullptr_t>::value, + ""); } }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits