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

Add swap(circular_buffer_ext&&) (#1068) (#1072)

Browse Source
This commit is contained in:
Helder Duarte 2025-05-05 19:16:38 +01:00 committed by GitHub
parent 22391aa750
commit 66af2a69c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/etl/circular_buffer.h
View File

@ -1385,6 +1385,25 @@ namespace etl
#endif
}
#if ETL_USING_CPP11
//*************************************************************************
/// Swap with another circular buffer
//*************************************************************************
void swap(circular_buffer_ext&& other) ETL_NOEXCEPT
{
using ETL_OR_STD::swap; // Allow ADL
swap(this->in, other.in);
swap(this->out, other.out);
swap(this->pbuffer, other.pbuffer);
swap(this->buffer_size, other.buffer_size);
#if defined(ETL_DEBUG_COUNT)
this->etl_debug_count.swap(other.etl_debug_count);
#endif
}
#endif
//*************************************************************************
/// set_buffer
//*************************************************************************
@ -1439,6 +1458,17 @@ namespace etl
lhs.swap(rhs);
}
#if ETL_USING_CPP11
//*************************************************************************
/// Overloaded swap for etl::circular_buffer_ext<T, 0>
//*************************************************************************
template <typename T>
void swap(etl::circular_buffer_ext<T>& lhs, etl::circular_buffer_ext<T>&& rhs)
{
lhs.swap(rhs);
}
#endif
//*************************************************************************
/// Equality operator
//*************************************************************************

34
test/test_circular_buffer_external_buffer.cpp
View File

@ -1033,6 +1033,40 @@ namespace
CHECK(std::equal(input2.begin(), input2.end(), data1.begin()));
}
#if ETL_USING_CPP11
//*************************************************************************
TEST(test_swap_with_rvalue)
{
etl::uninitialized_buffer_of<Ndc, 6U> buffer1;
etl::uninitialized_buffer_of<Ndc, 7U> buffer2;
etl::uninitialized_buffer_of<Ndc, 8U> buffer3;
Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4") };
Compare input2{ Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
Compare input3{ Ndc("13"), Ndc("14"), Ndc("15"), Ndc("16"), Ndc("17"), Ndc("18"), Ndc("19") };
Data data1(buffer1.raw, 5U);
Data data2(buffer2.raw, 6U);
Data data3(buffer3.raw, 7U);
data1.push(input1.begin(), input1.end());
data2.push(input2.begin(), input2.end());
data3.push(input3.begin(), input3.end());
data1.swap(std::move(data2));
CHECK_EQUAL(input1.size(), data2.size());
CHECK_EQUAL(input2.size(), data1.size());
CHECK(std::equal(input1.begin(), input1.end(), data2.begin()));
CHECK(std::equal(input2.begin(), input2.end(), data1.begin()));
swap(data1, std::move(data3));
CHECK_EQUAL(input2.size(), data3.size());
CHECK_EQUAL(input3.size(), data1.size());
CHECK(std::equal(input2.begin(), input2.end(), data3.begin()));
CHECK(std::equal(input3.begin(), input3.end(), data1.begin()));
}
#endif
//*************************************************************************
TEST(test_equal)
{