AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 14:59:50 +00:00
Files Issues Releases Activity

Fix build: use same signature for alg::lexicographical_compare_three_way as std::

Browse Source 
This makes it clearer that it is a polyfill-type affair
and make it easier to swap for the std:: one when the
compiler support is guaranteed.

Also avoid double underscores in parameter names,
as well as underscore-capital latter as they are reserved.
This commit is contained in:
John Beard 2024-09-18 06:56:03 +01:00
parent f978fd4436
commit 99e1869987
2 changed files with 17 additions and 12 deletions
include
base_set.h
libs/core/include/core
kicad_algo.h

2
include/base_set.h
View File

@ -211,7 +211,7 @@ public:
// Define less-than operator for comparison
bool operator<( const BASE_SET& other ) const
{
return alg::lexicographical_compare( begin(), end(), other.begin(), other.end() ) < 0;
return alg::lexicographical_compare_three_way( begin(), end(), other.begin(), other.end() ) < 0;
}
// Custom iterator to iterate over set bits

27
libs/core/include/core/kicad_algo.h
View File

@ -244,20 +244,25 @@ size_t longest_common_subset( const _Container& __c1, const _Container& __c2 )
*
* Returns a negative value if the first container is less than the second,
* zero if they are equal, and a positive value if the first container is
* greater than the second. This is a re-implementation of std::lexicographical_compare_3way
* because it is not available in all compilers.
* greater than the second. This is a re-implementation of
* std::lexicographical_compare_three_way because it is not available in all
* compilers.
*/
template <class _Container1, class _Container2>
int lexicographical_compare_3way( const _Container1& __c1, const _Container2& __c2 )
template <class Container1Iter, class Container2Iter>
int lexicographical_compare_three_way( Container1Iter aC1_first, Container1Iter aC1_last,
Container2Iter aC2_first, Container2Iter aC2_last )
{
#ifdef __cpp_lib_three_way_comparison // Check to see if we have an optimized version
auto retval = std::lexicographical_compare_three_way( __c1.begin(), __c1.end(), __c2.begin(), __c2.end() );
return retval == std::strong_ordering::equal ? 0 : ( retval == std::strong_ordering::less ? -1 : 1 );
auto retval =
std::lexicographical_compare_three_way( aC1_first, aC1_last, aC2_first, aC2_last );
return retval == std::strong_ordering::equal
? 0
: ( retval == std::strong_ordering::less ? -1 : 1 );
#else
auto it1 = __c1.begin();
auto it2 = __c2.begin();
Container1Iter it1 = aC1_first;
Container2Iter it2 = aC2_first;
while( it1 != __c1.end() && it2 != __c2.end() )
while( it1 != aC1_last && it2 != aC2_last )
{
if( *it1 < *it2 )
return -1;
@ -267,8 +272,8 @@ int lexicographical_compare_3way( const _Container1& __c1, const _Container2& __
++it2;
}
if( it2 == __c2.end() )
return !( it1 == __c1.end() );
if( it2 == aC2_last )
return !( it1 == aC1_last );
else
return -1;
#endif // __cpp_lib_three_way_comparison