diff options
| author | Eric Fiselier <eric@efcs.ca> | 2019-04-26 01:02:18 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2019-04-26 01:02:18 +0000 |
| commit | 7e528bc4ce51daae5b90bf641f15ea564901de8b (patch) | |
| tree | dcbce5acb5b1133b8608ebc91ceedc0ec9530eb6 /libcxx/include/tuple | |
| parent | 1b76063a5e023b39b4a395d7fc68fd5fe1e6aba3 (diff) | |
| download | bcm5719-llvm-7e528bc4ce51daae5b90bf641f15ea564901de8b.tar.gz bcm5719-llvm-7e528bc4ce51daae5b90bf641f15ea564901de8b.zip | |
Fix return type of std::tuple_cat.
When the arguments to tuple cat were const, the const was incorrectly
propagated into the type of the resulting tuple. For example:
const std::tuple<int> t(42);
auto r = std::tuple_cat(t, t);
// Incorrect! should be std::tuple<int, int>.
static_assert(is_same_v<decltype(r), std::tuple<const int, const int>>);
llvm-svn: 359255
Diffstat (limited to 'libcxx/include/tuple')
| -rw-r--r-- | libcxx/include/tuple | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/tuple b/libcxx/include/tuple index 335e59e670d..7437d5c485e 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -1211,7 +1211,7 @@ template <class ..._Types, class _Tuple0> struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0> { typedef typename __tuple_cat_type<tuple<_Types...>, - typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type>::type + typename __make_tuple_types<typename __uncvref<_Tuple0>::type>::type>::type type; }; @@ -1220,7 +1220,7 @@ struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0, _Tuple1, _Tuples... : public __tuple_cat_return_1< typename __tuple_cat_type< tuple<_Types...>, - typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type + typename __make_tuple_types<typename __uncvref<_Tuple0>::type>::type >::type, __tuple_like<typename remove_reference<_Tuple1>::type>::value, _Tuple1, _Tuples...> |
