From ede1aa2d3123f52ad99d951d4b8e8ac8a342b1f0 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 14 Aug 2013 15:15:28 +0000 Subject: [PATCH] Add a deleted assignment operator for basic_ostream; LWG Issue #2067 llvm-svn: 188375 --- libcxx/include/ostream | 4 ++++ libcxx/www/cxx1y_status.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libcxx/include/ostream b/libcxx/include/ostream index ce710ac304bc..2c618d41b9dd 100644 --- a/libcxx/include/ostream +++ b/libcxx/include/ostream @@ -32,6 +32,7 @@ public: virtual ~basic_ostream(); // 27.7.2.3 Assign/swap + basic_ostream& operator=(const basic_ostream& rhs) = delete; // C++14 basic_ostream& operator=(basic_ostream&& rhs); void swap(basic_ostream& rhs); @@ -161,6 +162,9 @@ protected: #endif // 27.7.2.3 Assign/swap +#if _LIBCPP_STD_VER > 11 + basic_ostream& operator=(const basic_ostream&) = delete; +#endif #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY basic_ostream& operator=(basic_ostream&& __rhs); diff --git a/libcxx/www/cxx1y_status.html b/libcxx/www/cxx1y_status.html index ae55f2317685..07dae697d1e9 100644 --- a/libcxx/www/cxx1y_status.html +++ b/libcxx/www/cxx1y_status.html @@ -88,7 +88,7 @@ 2061make_move_iterator and arraysKona 2064More noexcept issues in basic_stringKona 2065Minimal allocator interfaceKona - 2067packaged_task should have deleted copy c'tor with const parameterKona + 2067packaged_task should have deleted copy c'tor with const parameterKonaComplete 2069Inconsistent exception spec for basic_string move constructorKona 2096Incorrect constraints of future::get in regard toKona 2102Why is std::launch an implementation-defined type?Kona