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

Fix enable_shared_from_this test in C++11

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302721 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-10 20:09:20 +00:00
parent f6e8a9c876
commit 74424d09b4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
View File

@@ -50,7 +50,6 @@ struct Bar : public Foo {
struct PrivateBase : private std::enable_shared_from_this<PrivateBase> { struct PrivateBase : private std::enable_shared_from_this<PrivateBase> {
std::weak_ptr<PrivateBase> get_weak() { return weak_from_this(); }
}; };
@@ -79,12 +78,12 @@ int main()
assert(p == q); assert(p == q);
assert(!p.owner_before(q) && !q.owner_before(p)); // p and q share ownership assert(!p.owner_before(q) && !q.owner_before(p)); // p and q share ownership
} }
{ {
typedef std::shared_ptr<PrivateBase> APtr; typedef std::shared_ptr<PrivateBase> APtr;
typedef std::weak_ptr<PrivateBase> WeakAPtr; typedef std::weak_ptr<PrivateBase> WeakAPtr;
APtr a1 = std::make_shared<PrivateBase>(); APtr a1 = std::make_shared<PrivateBase>();
assert(a1.use_count() == 1); assert(a1.use_count() == 1);
} }
// Test LWG issue 2529. Only reset '__weak_ptr_' when it's already expired. // Test LWG issue 2529. Only reset '__weak_ptr_' when it's already expired.
// http://cplusplus.github.io/LWG/lwg-active.html#2529. // http://cplusplus.github.io/LWG/lwg-active.html#2529.
// Test two different ways: // Test two different ways: