Author: marshall
Date: Sun Oct 25 14:52:47 2015
New Revision: 251253
URL: http://llvm.org/viewvc/llvm-project?rev=251253&view=rev
Log:
Fix LWG#2476: scoped_allocator_adaptor is not assignable
Modified:
libcxx/trunk/include/scoped_allocator
Modified: libcxx/trunk/include/scoped_allocator
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/scoped_allocator?rev=251253&r1=251252&r2=251253&view=diff
==============================================================================
--- libcxx/trunk/include/scoped_allocator (original)
+++ libcxx/trunk/include/scoped_allocator Sun Oct 25 14:52:47 2015
@@ -58,6 +58,8 @@ public:
template <class OuterA2>
scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2,
InnerAllocs...>&& other) noexcept;
+ scoped_allocator_adaptor& operator=(const scoped_allocator_adaptor&) =
default;
+ scoped_allocator_adaptor& operator=(scoped_allocator_adaptor&&) = default;
~scoped_allocator_adaptor();
inner_allocator_type& inner_allocator() noexcept;
@@ -457,6 +459,8 @@ public:
scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>&& __other)
_NOEXCEPT
: base(_VSTD::move(__other)) {}
+ // scoped_allocator_adaptor& operator=(const scoped_allocator_adaptor&) =
default;
+ // scoped_allocator_adaptor& operator=(scoped_allocator_adaptor&&) =
default;
// ~scoped_allocator_adaptor() = default;
_LIBCPP_INLINE_VISIBILITY
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
