coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix operator=() functions

Browse Source
This commit is contained in:
John Wellbelove 2026-01-17 13:54:22 +01:00
parent e9c2577d8e
commit e1e3e37e77
2 changed files with 72 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/etl/tuple.h
View File

@ -559,9 +559,9 @@ namespace etl
//*********************************
/// Assign from lvalue pair tuple type.
//*********************************
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>, etl::enable_if_t<NTypes == 2U, int> = 0>
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>(), etl::enable_if_t<NTypes == 2U, int> = 0>
ETL_CONSTEXPR14
tuple& operator =(pair<U1, U2>& p)
tuple& operator =(ETL_OR_STD::pair<U1, U2>& p)
{
get_value() = p.first;
get_base().get_value() = p.second;
@ -572,9 +572,9 @@ namespace etl
//*********************************
/// Assign from const lvalue pair tuple type.
//*********************************
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>, etl::enable_if_t<NTypes == 2U, int> = 0>
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>(), etl::enable_if_t<NTypes == 2U, int> = 0>
ETL_CONSTEXPR14
tuple& operator =(const pair<U1, U2>& p)
tuple& operator =(const ETL_OR_STD::pair<U1, U2>& p)
{
get_value() = p.first;
get_base().get_value() = p.second;
@ -585,9 +585,9 @@ namespace etl
//*********************************
/// Assign from rvalue pair tuple type.
//*********************************
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>, etl::enable_if_t<NTypes == 2U, int> = 0>
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>(), etl::enable_if_t<NTypes == 2U, int> = 0>
ETL_CONSTEXPR14
tuple& operator =(pair<U1, U2>&& p)
tuple& operator =(ETL_OR_STD::pair<U1, U2>&& p)
{
get_value() = etl::forward<U1>(p.first);
get_base().get_value() = etl::forward<U2>(p.second);
@ -598,12 +598,12 @@ namespace etl
//*********************************
/// Assign from const rvalue pair tuple type.
//*********************************
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>, etl::enable_if_t<NTypes == 2U, int> = 0>
template <typename U1, typename U2, size_t NTypes = number_of_types<THead, TTail...>(), etl::enable_if_t<NTypes == 2U, int> = 0>
ETL_CONSTEXPR14
tuple& operator =(const pair<U1, U2>&& p)
tuple& operator =(const ETL_OR_STD::pair<U1, U2>&& p)
{
get_value() = etl::forward<U1>(p.first);
get_base().get_value() = etl::forward<U2>(p.second);
get_value() = p.first;
get_base().get_value() = p.second;
return *this;
}

62
test/test_tuple.cpp
View File

@ -756,5 +756,67 @@ namespace
CHECK_EQUAL(etl::get<2>(tp), s);
}
#endif
//*************************************************************************
TEST(test_assign_from_lvalue_pair)
{
ETL_OR_STD::pair<int, Data> p(1, Data("2"));
etl::tuple<int, Data> tp(0, Data(""));
tp = p;
int i = etl::get<0>(tp);
Data d = etl::get<1>(tp);
CHECK_EQUAL(1, i);
CHECK_EQUAL(std::string("2"), d.value);
}
//*************************************************************************
TEST(test_assign_from_const_lvalue_pair)
{
const ETL_OR_STD::pair<int, Data> p(1, Data("2"));
etl::tuple<int, Data> tp(0, Data(""));
tp = p;
int i = etl::get<0>(tp);
Data d = etl::get<1>(tp);
CHECK_EQUAL(1, i);
CHECK_EQUAL(std::string("2"), d.value);
}
//*************************************************************************
TEST(test_assign_from_rvalue_pair)
{
etl::tuple<int, Data> tp(0, Data(""));
tp = ETL_OR_STD::pair<int, Data>(1, Data("2"));
int i = etl::get<0>(tp);
Data d = etl::get<1>(tp);
CHECK_EQUAL(1, i);
CHECK_EQUAL(std::string("2"), d.value);
}
//*************************************************************************
TEST(test_assign_from_const_rvalue_pair)
{
const ETL_OR_STD::pair<int, Data> p(1, Data("2"));
etl::tuple<int, Data> tp(0, Data(""));
tp = static_cast<const ETL_OR_STD::pair<int, Data>&&>(p);
int i = etl::get<0>(tp);
Data d = etl::get<1>(tp);
CHECK_EQUAL(1, i);
CHECK_EQUAL(std::string("2"), d.value);
}
}
}