diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-04-13 00:34:24 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-04-13 00:34:24 +0000 |
| commit | e1ec29869b946bda518f91ffa6aaed664028c888 (patch) | |
| tree | f4a39e18c986cf9990acd3b78ba3593c3786ef5b /libcxx/include/__split_buffer | |
| parent | 3233d3eb460b5d4e98e5049ec5f3dfe63b11d234 (diff) | |
| download | bcm5719-llvm-e1ec29869b946bda518f91ffa6aaed664028c888.tar.gz bcm5719-llvm-e1ec29869b946bda518f91ffa6aaed664028c888.zip | |
Fix most failures caused by r300140
r300140 introduced a bunch of failures by changing the internal
interface provided by __compressed_pair. This patch fixes all of
the failures caused by the new interface by changing the existing
code to use it.
In addition to those changes this patch also fixes two separate
issues causing test failures:
1) Fix the member swap definition for __map_value_compare. Previously
the swap was incorrectly configured to swap the comparator as const.
2) Fix an assertion failure in futures.task.members/ctor_func_alloc.pass.cpp
that incorrectly expected a move to take place when a single copy is sufficient.
There is one remaining failure regarding make_shared. I'll commit a fix for that
shortly.
llvm-svn: 300148
Diffstat (limited to 'libcxx/include/__split_buffer')
| -rw-r--r-- | libcxx/include/__split_buffer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer index 79d1aa1d7c4..e74cf1f3b77 100644 --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -361,7 +361,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c) template <class _Tp, class _Allocator> __split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a) - : __end_cap_(__a) + : __end_cap_(__second_tag(), __a) { if (__a == __c.__alloc()) { |
