LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unique_ptr.runtime tests for null inputs. Patch from STL@microsoft.com

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276587 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-07-24 23:48:26 +00:00
parent aafdbda646
commit 4218032e70
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/std/utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor.pass.cpp
View File

@@ -16,6 +16,8 @@
#include <memory> #include <memory>
#include <cassert> #include <cassert>
#include "test_macros.h"
class Deleter class Deleter
{ {
int state_; int state_;
@@ -36,9 +38,18 @@ int main()
Deleter d; Deleter d;
assert(d.state() == 0); assert(d.state() == 0);
{ {
std::unique_ptr<int[], Deleter&> p(nullptr, d);
assert(p.get() == 0);
assert(&p.get_deleter() == &d);
}
#if defined(_LIBCPP_VERSION)
{
// The standard only requires the constructor accept nullptr, but libc++
// also supports the literal 0.
std::unique_ptr<int[], Deleter&> p(0, d); std::unique_ptr<int[], Deleter&> p(0, d);
assert(p.get() == 0); assert(p.get() == 0);
assert(&p.get_deleter() == &d); assert(&p.get_deleter() == &d);
} }
#endif
assert(d.state() == 0); assert(d.state() == 0);
} }

2
test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01.pass.cpp
View File

@@ -42,7 +42,9 @@ int main()
assert(A::count == 0); assert(A::count == 0);
{ // LWG#2520 says that nullptr is a valid input as well as null { // LWG#2520 says that nullptr is a valid input as well as null
#ifdef _LIBCPP_VERSION
std::unique_ptr<A[], Deleter<A[]> > s1(NULL, Deleter<A[]>()); std::unique_ptr<A[], Deleter<A[]> > s1(NULL, Deleter<A[]>());
#endif
std::unique_ptr<A[], Deleter<A[]> > s2(nullptr, Deleter<A[]>()); std::unique_ptr<A[], Deleter<A[]> > s2(nullptr, Deleter<A[]>());
} }
assert(A::count == 0); assert(A::count == 0);