diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2017-05-11 14:25:45 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2017-05-11 14:25:45 +0000 |
| commit | 35f62e32285ad6cb263794a7d0d712855dc578c7 (patch) | |
| tree | 93006fe102b3eed2639cf932a06648a90545d4b9 | |
| parent | 71ed2e6457e4778473eb65ebfff219b576148dd5 (diff) | |
| download | bcm5719-llvm-35f62e32285ad6cb263794a7d0d712855dc578c7.tar.gz bcm5719-llvm-35f62e32285ad6cb263794a7d0d712855dc578c7.zip | |
Mark LWG#2782 as complete. No functionality change; we already do this. Just added a few more tests.
llvm-svn: 302802
| -rw-r--r-- | libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp | 8 | ||||
| -rw-r--r-- | libcxx/www/cxx1z_status.html | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp index 0aef2af85cc..2aa19c6188a 100644 --- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp +++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp @@ -107,5 +107,11 @@ int main() assert((a.inner_allocator() == std::scoped_allocator_adaptor<A2<int>, A3<int>>(A2<int>(5), A3<int>(6)))); } - +// Test for LWG2782 + { + static_assert(!std::is_convertible<A1<int>, A2<int>>::value, ""); + static_assert(!std::is_convertible< + std::scoped_allocator_adaptor<A1<int>>, + std::scoped_allocator_adaptor<A2<int>>>::value, ""); + } } diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html index c108e71d69b..101ad43212e 100644 --- a/libcxx/www/cxx1z_status.html +++ b/libcxx/www/cxx1z_status.html @@ -437,7 +437,7 @@ <tr><td><a href="http://wg21.link/LWG2768">2768</a></td><td>any_cast and move semantics</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2769">2769</a></td><td>Redundant const in the return type of any_cast(const any&)</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2781">2781</a></td><td>Contradictory requirements for std::function and std::reference_wrapper</td><td>Kona</td><td>Complete</td></tr> - <tr><td><a href="http://wg21.link/LWG2782">2782</a></td><td>scoped_allocator_adaptor constructors must be constrained</td><td>Kona</td><td></td></tr> + <tr><td><a href="http://wg21.link/LWG2782">2782</a></td><td>scoped_allocator_adaptor constructors must be constrained</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2784">2784</a></td><td>Resolution to LWG 2484 is missing "otherwise, no effects" and is hard to parse</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2785">2785</a></td><td>quoted should work with basic_string_view</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2786">2786</a></td><td>Annex C should mention shared_ptr changes for array support</td><td>Kona</td><td>Complete</td></tr> |
