procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Simplify std::variant comparison operators

Browse source 
libstdc++-v3/ChangeLog:

	* include/std/variant (_VARIANT_RELATION_FUNCTION_TEMPLATE):
	Simplify.
This commit is contained in:
Jonathan Wakely 2024-03-28 14:19:45 +00:00
parent 74690ff96b
commit 6709e35457
No known key found for this signature in database
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libstdc++-v3/include/std/variant
View file

@ -1245,7 +1245,7 @@ namespace __variant
# define _VARIANT_RELATION_FUNCTION_CONSTRAINTS(TYPES, OP)
#endif
#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP, __NAME) \
#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP) \
template<typename... _Types> \
_VARIANT_RELATION_FUNCTION_CONSTRAINTS(_Types, __OP) \
constexpr bool \
@ -1262,22 +1262,20 @@ namespace __variant
{ \
auto& __this_mem = std::get<__rhs_index>(__lhs); \
__ret = __this_mem __OP __rhs_mem; \
return; \
} \
else \
__ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \
} \
else \
__ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \
__ret = (__lhs.index() + 1) __OP (__rhs_index + 1); \
}, __rhs); \
return __ret; \
}
_VARIANT_RELATION_FUNCTION_TEMPLATE(<, less)
_VARIANT_RELATION_FUNCTION_TEMPLATE(<=, less_equal)
_VARIANT_RELATION_FUNCTION_TEMPLATE(==, equal)
_VARIANT_RELATION_FUNCTION_TEMPLATE(!=, not_equal)
_VARIANT_RELATION_FUNCTION_TEMPLATE(>=, greater_equal)
_VARIANT_RELATION_FUNCTION_TEMPLATE(>, greater)
_VARIANT_RELATION_FUNCTION_TEMPLATE(<)
_VARIANT_RELATION_FUNCTION_TEMPLATE(<=)
_VARIANT_RELATION_FUNCTION_TEMPLATE(==)
_VARIANT_RELATION_FUNCTION_TEMPLATE(!=)
_VARIANT_RELATION_FUNCTION_TEMPLATE(>=)
_VARIANT_RELATION_FUNCTION_TEMPLATE(>)
#undef _VARIANT_RELATION_FUNCTION_TEMPLATE