Changes in libcfa/src/time.hfa [e638266:030653a]

File:

• libcfa/src/time.hfa (modified) (5 diffs)

libcfa/src/time.hfa

@@ -10 +10 @@
 // Created On       : Wed Mar 14 23:18:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 21 06:32:31 2021
-// Update Count     : 667
+// Last Modified On : Wed Jun 17 16:13:00 2020
+// Update Count     : 663
 //
 
@@ -28 +28 @@
 
 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 }; }
-        Duration ?=?( Duration & dur, timeval t ) with( dur ) {
-                tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_usec * (TIMEGRAN / 1_000_000LL);
-                return dur;
-        } // ?=?
-        Duration ?=?( Duration & dur, timespec t ) with( dur ) {
-                tn = (int64_t)t.tv_sec * TIMEGRAN + t.tv_nsec;
-                return dur;
-        } // ?=?
 
         Duration +?( Duration rhs ) with( rhs ) { return (Duration)@{ +tn }; }
@@ -60 +49 @@
         Duration ?%?( Duration lhs, Duration rhs ) { return (Duration)@{ lhs.tn % rhs.tn }; }
         Duration ?%=?( Duration & lhs, Duration rhs ) { lhs = lhs % rhs; return lhs; }
+
+        bool ?==?( Duration lhs, Duration rhs ) { return lhs.tn == rhs.tn; }
+        bool ?!=?( Duration lhs, Duration rhs ) { return lhs.tn != rhs.tn; }
+        bool ?<? ( Duration lhs, Duration rhs ) { return lhs.tn <  rhs.tn; }
+        bool ?<=?( Duration lhs, Duration rhs ) { return lhs.tn <= rhs.tn; }
+        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; }
@@ -67 +63 @@
         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; }
-        bool ?!=?( Duration lhs, Duration rhs ) { return lhs.tn != rhs.tn; }
-        bool ?<? ( Duration lhs, Duration rhs ) { return lhs.tn <  rhs.tn; }
-        bool ?<=?( Duration lhs, Duration rhs ) { return lhs.tn <= rhs.tn; }
-        bool ?>? ( Duration lhs, Duration rhs ) { return lhs.tn >  rhs.tn; }
-        bool ?>=?( Duration lhs, Duration rhs ) { return lhs.tn >= rhs.tn; }
 
         Duration abs( Duration rhs ) { return rhs.tn >= 0 ? rhs : -rhs; }
@@ -163 +152 @@
 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 {
+        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; }
-        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 }; }
         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;