From 35f62e32285ad6cb263794a7d0d712855dc578c7 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 11 May 2017 14:25:45 +0000 Subject: [PATCH] Mark LWG#2782 as complete. No functionality change; we already do this. Just added a few more tests. llvm-svn: 302802 --- .../allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp | 8 +++++++- 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 0aef2af..2aa19c6 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, A3>(A2(5), A3(6)))); } - +// Test for LWG2782 + { + static_assert(!std::is_convertible, A2>::value, ""); + static_assert(!std::is_convertible< + std::scoped_allocator_adaptor>, + std::scoped_allocator_adaptor>>::value, ""); + } } diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html index c108e71..101ad43 100644 --- a/libcxx/www/cxx1z_status.html +++ b/libcxx/www/cxx1z_status.html @@ -437,7 +437,7 @@ 2768any_cast and move semanticsKonaComplete 2769Redundant const in the return type of any_cast(const any&)KonaComplete 2781Contradictory requirements for std::function and std::reference_wrapperKonaComplete - 2782scoped_allocator_adaptor constructors must be constrainedKona + 2782scoped_allocator_adaptor constructors must be constrainedKonaComplete 2784Resolution to LWG 2484 is missing "otherwise, no effects" and is hard to parseKonaComplete 2785quoted should work with basic_string_viewKonaComplete 2786Annex C should mention shared_ptr changes for array supportKonaComplete -- 2.7.4