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

Fixed building and unit tests run under XCode 2027 Beta 6 (#1572)

Browse Source 
* Update _index.md

* Update _index.md

* Cherry pick the Docker fixes for PowerPC (#1563)

Co-authored-by: John Wellbelove <john.wellbelove@etlcpp.com>

* Fixed building and unit tests run under XCode 2027 Beta 6 (AppleClang 21.0.0.21000333):
- Compilation failures:
  - `etl::ideque::iterator::operator[]` index type should be `difference_type` (instead of `size_t`).
  - random-access `etl::poly_span::iterator` is missing `operator[]`.
- Unit tests failures of `test_multimap` suit:
  - fixed `equal_range`-related tests to properly verify result range (via new `Check_Equal` overload helper).
  - fixed `find`-related tests to not depend on particular order of `second` values (via new `Check_ContainsPair` helper). See note 1,2) at [cppreference](https://cppreference.com/cpp/container/multimap/find) about order.

* PR review fixes.

---------

Co-authored-by: John Wellbelove <jwellbelove@users.noreply.github.com>
Co-authored-by: John Wellbelove <john.wellbelove@etlcpp.com>
This commit is contained in:
Sergei 2026-08-28 12:21:00 +03:00 committed by GitHub
parent 1a1f259ccb
commit 49a9ebde78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 122 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/etl/deque.h
View File

@ -348,16 +348,7 @@ namespace etl
}
//***************************************************
reference operator[](size_t i)
{
iterator result(*this);
result += i;
return *result;
}
//***************************************************
const_reference operator[](size_t i) const
reference operator[](difference_type i) const
{
iterator result(*this);
result += i;
@ -607,10 +598,10 @@ namespace etl
}
//***************************************************
const_reference operator[](size_t i) const
const_reference operator[](difference_type i) const
{
const_iterator result(*this);
result += static_cast<difference_type>(i);
result += i;
return *result;
}

10
include/etl/poly_span.h
View File

@ -77,6 +77,7 @@ namespace etl
typedef ptrdiff_t difference_type;
typedef TBase* pointer;
typedef TBase& reference;
typedef const TBase& const_reference;
typedef ETL_OR_STD::random_access_iterator_tag iterator_category;
//*****************************************
@ -114,6 +115,15 @@ namespace etl
return ptr;
}
//***************************************************
reference operator[](difference_type i) const
{
iterator result(*this);
result += i;
return *result;
}
//*****************************************
iterator& operator++()
{

5
test/test_deque.cpp
View File

@ -2389,9 +2389,10 @@ namespace
#include "etl/private/diagnostic_uninitialized_push.h"
// Verify operator[] returns values matching sequential access
for (size_t i = 0; i < cdata.size(); ++i)
DataNDC::difference_type it_idx = 0;
for (size_t i = 0; i < cdata.size(); ++i, ++it_idx)
{
CHECK(cit[i] == cdata[i]);
CHECK(cit[it_idx] == cdata[i]);
}
// Verify const_iterator operator[] returns const_reference

208
test/test_multimap.cpp
View File

@ -103,6 +103,34 @@ namespace
return true;
}
template <typename R1, typename R2>
bool Check_Equal(R1 range1, R2 range2)
{
while (range1.first != range1.second)
{
if (range2.first == range2.second)
{
return false;
}
auto& pair1 = *range1.first;
auto& pair2 = *range2.first;
if ((pair1.first != pair2.first) || (pair1.second != pair2.second))
{
return false;
}
++range1.first;
++range2.first;
}
return range2.first == range2.second;
}
template <typename T1, typename T2>
bool Check_ContainsPair(T1 begin, T1 end, const T2& pair)
{
return std::find_if(begin, end, [&pair](typename T1::reference item) { return (item.first == pair.first) && (item.second == pair.second); })
!= end;
}
#include "etl/private/diagnostic_null_dereference_push.h"
//*************************************************************************
@ -694,13 +722,7 @@ namespace
ETL_OR_STD::pair<Compare_Data::iterator, Compare_Data::iterator> compare_result = compare_data.equal_range("1");
// Check that both return the same return results
CHECK(compare_result.first->first == data_result.first->first);
CHECK(compare_result.first->second == data_result.first->second);
CHECK(compare_result.second->first == data_result.second->first);
CHECK(compare_result.second->second == data_result.second->second);
bool isEqual = Check_Equal(data.begin(), data.end(), compare_data.begin());
const bool isEqual = Check_Equal(data_result, compare_result);
CHECK(isEqual);
}
@ -718,13 +740,7 @@ namespace
ETL_OR_STD::pair<CMap::iterator, CMap::iterator> compare_result = compare_data.equal_range("1");
// Check that both return the same return results
CHECK(compare_result.first->first == data_result.first->first);
CHECK(compare_result.first->second == data_result.first->second);
CHECK(compare_result.second->first == data_result.second->first);
CHECK(compare_result.second->second == data_result.second->second);
bool isEqual = Check_Equal(data.begin(), data.end(), compare_data.begin());
const bool isEqual = Check_Equal(data_result, compare_result);
CHECK(isEqual);
}
@ -739,13 +755,7 @@ namespace
ETL_OR_STD::pair<Compare_Data::const_iterator, Compare_Data::const_iterator> compare_result = compare_data.equal_range("2");
// Check that both return the same return results
CHECK(compare_result.first->first == data_result.first->first);
CHECK(compare_result.first->second == data_result.first->second);
CHECK(compare_result.second->first == data_result.second->first);
CHECK(compare_result.second->second == data_result.second->second);
bool isEqual = Check_Equal(data.begin(), data.end(), compare_data.begin());
const bool isEqual = Check_Equal(data_result, compare_result);
CHECK(isEqual);
}
@ -763,13 +773,7 @@ namespace
ETL_OR_STD::pair<CMap::const_iterator, CMap::const_iterator> compare_result = compare_data.equal_range("2");
// Check that both return the same return results
CHECK(compare_result.first->first == data_result.first->first);
CHECK(compare_result.first->second == data_result.first->second);
CHECK(compare_result.second->first == data_result.second->first);
CHECK(compare_result.second->second == data_result.second->second);
bool isEqual = Check_Equal(data.begin(), data.end(), compare_data.begin());
const bool isEqual = Check_Equal(data_result, compare_result);
CHECK(isEqual);
}
@ -1022,47 +1026,47 @@ namespace
Compare_Data compare_data(initial_data.begin(), initial_data.end());
Data data(initial_data.begin(), initial_data.end());
Data::iterator i_data = data.find("0");
Compare_Data::iterator i_compare = compare_data.find("0");
Data::iterator i_data = data.find("0");
auto i_compare = compare_data.equal_range("0");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("1");
i_compare = compare_data.find("1");
i_compare = compare_data.equal_range("1");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("2");
i_compare = compare_data.find("2");
i_compare = compare_data.equal_range("2");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("3");
i_compare = compare_data.find("3");
i_compare = compare_data.equal_range("3");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(".");
i_compare = compare_data.find(".");
i_compare = compare_data.equal_range(".");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
i_data = data.find("A");
i_compare = compare_data.find("A");
i_compare = compare_data.equal_range("A");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
}
//*************************************************************************
@ -1075,46 +1079,46 @@ namespace
CMap compare_data(initial_data.begin(), initial_data.end());
EMap::iterator i_data = data.find(Key("0"));
CMap::iterator i_compare = compare_data.find("0");
auto i_compare = compare_data.equal_range("0");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("1"));
i_compare = compare_data.find("1");
i_compare = compare_data.equal_range("1");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("2"));
i_compare = compare_data.find("2");
i_compare = compare_data.equal_range("2");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("3"));
i_compare = compare_data.find("3");
i_compare = compare_data.equal_range("3");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("."));
i_compare = compare_data.find(".");
i_compare = compare_data.equal_range(".");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
i_data = data.find(Key("A"));
i_compare = compare_data.find("A");
i_compare = compare_data.equal_range("A");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
}
//*************************************************************************
@ -1123,47 +1127,47 @@ namespace
const Compare_Data compare_data(initial_data.begin(), initial_data.end());
const Data data(initial_data.begin(), initial_data.end());
Data::const_iterator i_data = data.find("0");
Compare_Data::const_iterator i_compare = compare_data.find("0");
Data::const_iterator i_data = data.find("0");
auto i_compare = compare_data.equal_range("0");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("1");
i_compare = compare_data.find("1");
i_compare = compare_data.equal_range("1");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("2");
i_compare = compare_data.find("2");
i_compare = compare_data.equal_range("2");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find("3");
i_compare = compare_data.find("3");
i_compare = compare_data.equal_range("3");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(".");
i_compare = compare_data.find(".");
i_compare = compare_data.equal_range(".");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
i_data = data.find("A");
i_compare = compare_data.find("A");
i_compare = compare_data.equal_range("A");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
}
//*************************************************************************
@ -1176,46 +1180,46 @@ namespace
const CMap compare_data(initial_data.begin(), initial_data.end());
EMap::const_iterator i_data = data.find(Key("0"));
CMap::const_iterator i_compare = compare_data.find("0");
auto i_compare = compare_data.equal_range("0");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("1"));
i_compare = compare_data.find("1");
i_compare = compare_data.equal_range("1");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("2"));
i_compare = compare_data.find("2");
i_compare = compare_data.equal_range("2");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("3"));
i_compare = compare_data.find("3");
i_compare = compare_data.equal_range("3");
// Check that both return successful return results
CHECK(i_compare->first == i_data->first);
CHECK(i_compare->second == i_data->second);
CHECK(i_data != data.end());
CHECK(Check_ContainsPair(i_compare.first, i_compare.second, *i_data));
i_data = data.find(Key("."));
i_compare = compare_data.find(".");
i_compare = compare_data.equal_range(".");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
i_data = data.find(Key("A"));
i_compare = compare_data.find("A");
i_compare = compare_data.equal_range("A");
// Check that both return successful return results
CHECK(data.end() == i_data);
CHECK(compare_data.end() == i_compare);
CHECK(i_data == data.end());
CHECK(i_compare.first == i_compare.second);
}
//*************************************************************************