diff options
author | Erik Pilkington <erik.pilkington@gmail.com> | 2017-05-25 16:16:17 +0000 |
---|---|---|
committer | Erik Pilkington <erik.pilkington@gmail.com> | 2017-05-25 16:16:17 +0000 |
commit | 76886e82e580339fe5638defb522f7ca8a6ec1e2 (patch) | |
tree | f585e2915722e7f865a88093cebe99a19d411845 | |
parent | 594d0d592dc25e0fd51b6bff83736cb3b00aa9a2 (diff) | |
download | bcm5719-llvm-76886e82e580339fe5638defb522f7ca8a6ec1e2.tar.gz bcm5719-llvm-76886e82e580339fe5638defb522f7ca8a6ec1e2.zip |
Fix a test that was failing in C++11 mode introduced in r303874
llvm-svn: 303878
-rw-r--r-- | libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp b/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp index f50ced09b7c..87cd29264b4 100644 --- a/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp +++ b/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp @@ -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, + ""); } }; |