Index: libcfa/src/time.hfa
===================================================================
--- libcfa/src/time.hfa	(revision 6c5d92fac53b3a47e9d4fcd8c136fc98aa0c7c03)
+++ libcfa/src/time.hfa	(revision 6f6b844499e167e0b3e2002220ed37d4cc3c3193)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar 14 23:18:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 14 09:30:30 2021
-// Update Count     : 664
+// Last Modified On : Tue Apr 20 23:25:58 2021
+// Update Count     : 665
 //
 
@@ -28,13 +28,12 @@
 
 static inline {
+	void ?{}( Duration & dur, timeval t ) with( dur ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * 1000; }
+	void ?{}( Duration & dur, timespec t ) with( dur ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec; }
+
 	Duration ?=?( Duration & dur, __attribute__((unused)) zero_t ) { return dur{ 0 }; }
-
-	void ?{}( Duration & dur, timeval t ) with( dur ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * 1000; }
 	Duration ?=?( Duration & dur, timeval t ) with( dur ) {
 		tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * (TIMEGRAN / 1_000_000LL);
 		return dur;
 	} // ?=?
-
-	void ?{}( Duration & dur, timespec t ) with( dur ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec; }
 	Duration ?=?( Duration & dur, timespec t ) with( dur ) {
 		tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec;
@@ -61,4 +60,11 @@
 	Duration ?%?( Duration lhs, Duration rhs ) { return (Duration)@{ lhs.tn % rhs.tn }; }
 	Duration ?%=?( Duration & lhs, Duration rhs ) { lhs = lhs % rhs; return lhs; }
+
+	bool ?==?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn == 0; }
+	bool ?!=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn != 0; }
+	bool ?<? ( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn <  0; }
+	bool ?<=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn <= 0; }
+	bool ?>? ( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn >  0; }
+	bool ?>=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn >= 0; }
 
 	bool ?==?( Duration lhs, Duration rhs ) { return lhs.tn == rhs.tn; }
@@ -68,11 +74,4 @@
 	bool ?>? ( Duration lhs, Duration rhs ) { return lhs.tn >  rhs.tn; }
 	bool ?>=?( Duration lhs, Duration rhs ) { return lhs.tn >= rhs.tn; }
-
-	bool ?==?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn == 0; }
-	bool ?!=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn != 0; }
-	bool ?<? ( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn <  0; }
-	bool ?<=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn <= 0; }
-	bool ?>? ( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn >  0; }
-	bool ?>=?( Duration lhs, __attribute__((unused)) zero_t ) { return lhs.tn >= 0; }
 
 	Duration abs( Duration rhs ) { return rhs.tn >= 0 ? rhs : -rhs; }
@@ -118,7 +117,7 @@
 static inline {
 	void ?{}( timeval & t ) {}
+	void ?{}( timeval & t, __attribute__((unused)) zero_t ) { t{ 0, 0 }; }
 	void ?{}( timeval & t, time_t sec, suseconds_t usec ) { t.tv_sec = sec; t.tv_usec = usec; }
 	void ?{}( timeval & t, time_t sec ) { t{ sec, 0 }; }
-	void ?{}( timeval & t, __attribute__((unused)) zero_t ) { t{ 0, 0 }; }
 
 	timeval ?=?( timeval & t, __attribute__((unused)) zero_t ) { return t{ 0 }; }
@@ -133,7 +132,7 @@
 static inline {
 	void ?{}( timespec & t ) {}
+	void ?{}( timespec & t, __attribute__((unused)) zero_t ) { t{ 0, 0 }; }
 	void ?{}( timespec & t, time_t sec, __syscall_slong_t nsec ) { t.tv_sec = sec; t.tv_nsec = nsec; }
 	void ?{}( timespec & t, time_t sec ) { t{ sec, 0}; }
-	void ?{}( timespec & t, __attribute__((unused)) zero_t ) { t{ 0, 0 }; }
 
 	timespec ?=?( timespec & t, __attribute__((unused)) zero_t ) { return t{ 0 }; }
@@ -164,13 +163,12 @@
 void ?{}( Time & time, int year, int month = 1, int day = 1, int hour = 0, int min = 0, int sec = 0, int64_t nsec = 0 );
 static inline {
+	void ?{}( Time & time, timeval t ) with( time ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * 1000; }
+	void ?{}( Time & time, timespec t ) with( time ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec; }
+
 	Time ?=?( Time & time, __attribute__((unused)) zero_t ) { return time{ 0 }; }
-
-	void ?{}( Time & time, timeval t ) with( time ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * 1000; }
 	Time ?=?( Time & time, timeval t ) with( time ) {
 		tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * (TIMEGRAN / 1_000_000LL);
 		return time;
 	} // ?=?
-
-	void ?{}( Time & time, timespec t ) with( time ) { tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec; }
 	Time ?=?( Time & time, timespec t ) with( time ) {
 		tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec;