From 05e7d24b3df0ea1486ff27a52e77132e1a683e1d Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Wed, 24 Apr 2013 19:44:26 +0000 Subject: [PATCH] default_delete needs a static_assert against void types. I had previously thought that sizeof(void) would take care of this. I was wrong. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@180213 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/memory | 2 ++ .../unique.ptr.dltr.dflt/void.fail.cpp | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp diff --git a/include/memory b/include/memory index 87436ac7..2a8b7e66 100644 --- a/include/memory +++ b/include/memory @@ -2485,6 +2485,7 @@ struct _LIBCPP_TYPE_VIS default_delete _LIBCPP_INLINE_VISIBILITY void operator() (_Tp* __ptr) const _NOEXCEPT { static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type"); + static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type"); delete __ptr; } }; @@ -2507,6 +2508,7 @@ public: typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) const _NOEXCEPT { static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type"); + static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type"); delete [] __ptr; } }; diff --git a/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp b/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp new file mode 100644 index 00000000..5d1cf1ff --- /dev/null +++ b/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp @@ -0,0 +1,24 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// default_delete + +// Test that default_delete's operator() requires a complete type + +#include +#include + +int main() +{ + std::default_delete d; + const void* p = 0; + d(p); +}