summaryrefslogtreecommitdiffstats
path: root/libcxx/include/string
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-09-02 20:42:31 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-09-02 20:42:31 +0000
commit8668139f361f0da6a61759643660f06bc72afad9 (patch)
tree50d45981fcdda13885405ff66ded4740901dfc88 /libcxx/include/string
parent09d153eb12e907572772a0533ccc7bf3aebef1bf (diff)
downloadbcm5719-llvm-8668139f361f0da6a61759643660f06bc72afad9.tar.gz
bcm5719-llvm-8668139f361f0da6a61759643660f06bc72afad9.zip
Fix const correctness bug in __move_assign. Found and fixed by Ion Gaztañaga.
llvm-svn: 139032
Diffstat (limited to 'libcxx/include/string')
-rw-r--r--libcxx/include/string6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/string b/libcxx/include/string
index a1dba310b5b..2041510fe50 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -1593,7 +1593,7 @@ private:
_LIBCPP_INLINE_VISIBILITY
void
- __move_assign_alloc(const basic_string& __str)
+ __move_assign_alloc(basic_string& __str)
_NOEXCEPT_(
!__alloc_traits::propagate_on_container_move_assignment::value ||
is_nothrow_move_assignable<allocator_type>::value)
@@ -1601,14 +1601,14 @@ private:
__alloc_traits::propagate_on_container_move_assignment::value>());}
_LIBCPP_INLINE_VISIBILITY
- void __move_assign_alloc(const basic_string& __c, true_type)
+ void __move_assign_alloc(basic_string& __c, true_type)
_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
{
__alloc() = _VSTD::move(__c.__alloc());
}
_LIBCPP_INLINE_VISIBILITY
- void __move_assign_alloc(const basic_string& __c, false_type)
+ void __move_assign_alloc(basic_string& __c, false_type)
_NOEXCEPT
{}
OpenPOWER on IntegriCloud