diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-10-25 19:52:47 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-10-25 19:52:47 +0000 |
| commit | cd5215d8c4e4376d0b53844656093e863139aabb (patch) | |
| tree | a3ddf3af4f421d8b59e6dd593f18af69009d85c2 /libcxx/include | |
| parent | b631c24359c8299d570786abc6fe81920d97c67b (diff) | |
| download | bcm5719-llvm-cd5215d8c4e4376d0b53844656093e863139aabb.tar.gz bcm5719-llvm-cd5215d8c4e4376d0b53844656093e863139aabb.zip | |
Fix LWG#2476: scoped_allocator_adaptor is not assignable
llvm-svn: 251253
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/scoped_allocator | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator index cd4987ad9bb..9436dac9c19 100644 --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -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 |
