mapi_lib: replace ical_time::twcompare with ical_time::operator<=>

Author: jengelh

include/gromox/defs.h

@@ -141,11 +141,6 @@ template<typename T> static inline T *re_alloc(void *x, size_t elem) {
 static inline const char *snul(const std::string &s) { return s.size() != 0 ? s.c_str() : nullptr; }
 static inline const char *znul(const char *s) { return s != nullptr ? s : ""; }
 
-template<typename U, typename V> static int three_way_compare(U &&a, V &&b)
-{
-	return (a < b) ? -1 : (a == b) ? 0 : 1;
-}
-
 #if defined(COMPILE_DIAG) && !defined(__clang__)
 struct GX_EXPORT errno_t {
 	constexpr errno_t(int x) : m_value(x) {

include/gromox/ical.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <compare>
 #include <ctime>
 #include <list>
 #include <memory>
@@ -91,11 +92,8 @@ struct GX_EXPORT ical_time {
 		year(y), month(m), day(d), hour(hr), minute(min), second(sec)
 	{}
 
-	int twcompare(const ical_time &other) const;
-	inline bool operator<(const ical_time &o) const { return twcompare(o) < 0; }
-	inline bool operator<=(const ical_time &o) const { return twcompare(o) <= 0; }
-	inline bool operator>(const ical_time &o) const { return twcompare(o) > 0; }
-	inline bool operator>=(const ical_time &o) const { return twcompare(o) >= 0; }
+	std::strong_ordering operator<=>(const ical_time &other) const;
+	inline bool operator==(const ical_time &o) const { return (*this <=> o) == 0; }
 	void add_year(int ys);
 	void add_month(int ms);
 	void add_day(int ds);

lib/email/ical.cpp

@@ -5,6 +5,7 @@
 #include <cassert>
 #include <cerrno>
 #include <climits>
+#include <compare>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -665,31 +666,31 @@ bool ical_time::assign_datetime(const char *str_datetime)
 	return false;
 }
 
-int ical_time::twcompare(const ical_time &o) const
+std::strong_ordering ical_time::operator<=>(const ical_time &o) const
 {
-	auto r = three_way_compare(year, o.year);
+	auto r = year <=> o.year;
 	if (r != 0)
 		return r;
-	r = three_way_compare(month, o.month);
+	r = month <=> o.month;
 	if (r != 0)
 		return r;
-	r = three_way_compare(day, o.day);
+	r = day <=> o.day;
 	if (r != 0)
 		return r;
-	r = three_way_compare(hour, o.hour);
+	r = hour <=> o.hour;
 	if (r != 0)
 		return r;
-	r = three_way_compare(minute, o.minute);
+	r = minute <=> o.minute;
 	if (r != 0)
 		return r;
-	r = three_way_compare(second, o.second);
+	r = second <=> o.second;
 	if (r != 0)
 		return r;
 	if (leap_second > 59 && o.leap_second <= 59)
-		return 1;
+		return std::strong_ordering::greater;
 	if (leap_second <= 59 && o.leap_second > 59)
-		return -1;
-	return 0;
+		return std::strong_ordering::less;
+	return std::strong_ordering::equivalent;
 }
 
 static bool ical_is_leap_year(unsigned int year)
@@ -2176,7 +2177,7 @@ const char *ical_parse_rrule(const ical_component *ptz_component,
 			if (!ical_test_setpos(pirrule))
 				continue;
 		}
-		int cmp_result = itime.twcompare(pirrule->instance_itime);
+		auto cmp_result = itime <=> pirrule->instance_itime;
 		if (cmp_result < 0) {
 			continue;
 		} else if (cmp_result > 0) {

tests/utiltest.cpp

@@ -418,8 +418,11 @@ static int t_cmp_icaltime()
 	ical_time a{}, b{};
 	a.second = b.second = 59;
 	a.leap_second = 60;
-	if (a.twcompare(b) != -b.twcompare(a))
-		return printf("ical_time::compare failed\n");
+	assert(a == a);
+	assert(b == b);
+	assert(a != b);
+	assert(a > b);
+	assert(b < a);
 	return 0;
 }