Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ring_buffer comparation logic #514

Merged
merged 1 commit into from
Jul 7, 2023
Merged

Fix ring_buffer comparation logic #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions include/EASTL/bonus/ring_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,19 +1505,14 @@ namespace eastl
template <typename T, typename Container, typename Allocator>
inline bool operator==(const ring_buffer<T, Container, Allocator>& a, const ring_buffer<T, Container, Allocator>& b)
{
return (a.size() == b.size()) && (a.c == b.c);
return (a.size() == b.size()) && eastl::equal(a.begin(), a.end(), b.begin());
}


template <typename T, typename Container, typename Allocator>
inline bool operator<(const ring_buffer<T, Container, Allocator>& a, const ring_buffer<T, Container, Allocator>& b)
{
const typename ring_buffer<T, Container, Allocator>::size_type sizeA = a.size();
const typename ring_buffer<T, Container, Allocator>::size_type sizeB = b.size();

if(sizeA == sizeB)
return (a.c < b.c);
return sizeA < sizeB;
return eastl::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end());
}


Expand Down
50 changes: 50 additions & 0 deletions test/source/TestRingBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,56 @@ int TestRingBuffer()
EATEST_VERIFY(rbVectorInt[5] == 4);
}

{
// Comparation operator ==, operator <
// Fix bug mentioned in https://github.com/electronicarts/EASTL/issues/511
typedef ring_buffer<int, vector<int>> RBVectorInt;

RBVectorInt rbVectorInt(3);

rbVectorInt.push_back(0);
rbVectorInt.push_back(1);
rbVectorInt.push_back(2);
rbVectorInt.push_back(3);
rbVectorInt.push_back(4);

EATEST_VERIFY(rbVectorInt[0] == 2);
EATEST_VERIFY(rbVectorInt[1] == 3);
EATEST_VERIFY(rbVectorInt[2] == 4);

RBVectorInt rbVectorInt2({3, 4, 2});
RBVectorInt rbVectorInt3({2, 3, 4});
RBVectorInt rbVectorInt4({3, 4, 5});

EATEST_VERIFY(rbVectorInt != rbVectorInt2);
EATEST_VERIFY(rbVectorInt == rbVectorInt3);
EATEST_VERIFY(rbVectorInt < rbVectorInt4);
grojo-ea marked this conversation as resolved.
Show resolved Hide resolved

// Different size
RBVectorInt rbVectorInt5({1, 2});
EATEST_VERIFY(rbVectorInt != rbVectorInt5);
EATEST_VERIFY(rbVectorInt > rbVectorInt5);

RBVectorInt rbVectorInt6({2, 3});
EATEST_VERIFY(rbVectorInt != rbVectorInt6);
EATEST_VERIFY(rbVectorInt > rbVectorInt6);

RBVectorInt rbVectorInt7({3, 4});
EATEST_VERIFY(rbVectorInt != rbVectorInt7);
EATEST_VERIFY(rbVectorInt < rbVectorInt7);

RBVectorInt rbVectorInt8({1, 2, 3, 4});
EATEST_VERIFY(rbVectorInt != rbVectorInt8);
EATEST_VERIFY(rbVectorInt > rbVectorInt8);

RBVectorInt rbVectorInt9({2, 3, 4, 5});
EATEST_VERIFY(rbVectorInt != rbVectorInt9);
EATEST_VERIFY(rbVectorInt < rbVectorInt9);

RBVectorInt rbVectorInt10({3, 4, 5, 6});
EATEST_VERIFY(rbVectorInt != rbVectorInt10);
EATEST_VERIFY(rbVectorInt < rbVectorInt10);
}

{
EA::UnitTest::Rand rng(EA::UnitTest::GetRandSeed());
Expand Down
Loading