Changeset 98 for trunk/orca/op.c

Timestamp:

03/23/06 01:35:12 (3 years ago)

Author:

krobillard

Message:

Time is now stored as double. Removed OTime.

Files:

• trunk/orca/op.c (modified) (2 diffs)

trunk/orca/op.c

@@ -144 +144 @@
         if( orIs(b, OT_TIME) )
         {
-            OTime time;
-            OValue* res;
-
-            time.sec  = a->time.sec + b->time.sec;
-            time.usec = a->time.usec + b->time.usec;
-            if( time.usec > 1000000 )
-            {
-                time.sec  += 1;
-                time.usec -= 1000000;
-            }
-
-            res = orRESULT;
-            orSetTF( res, OT_TIME );
-            res->time = time;
+            orSeconds(a) += orSeconds(b);
             return;
         }
@@ -283 +270 @@
         if( orIs(b, OT_TIME) )
         {
-            OTime btime;
-            OValue* res;
-
-            // http://www.dusek.ch/manual/glibc/libc_21.html
-
-            btime = b->time;
-            if( a->time.usec < btime.usec )
-            {
-                int nsec = (btime.usec - a->time.usec) / 1000000 + 1;
-                btime.usec -= 1000000 * nsec;
-                btime.sec  += nsec;
-            }
-            if( a->time.usec - btime.usec > 1000000 )
-            {
-                int nsec = (a->time.usec - btime.usec) / 1000000;
-                btime.usec += 1000000 * nsec;
-                btime.sec  -= nsec;
-            }
-
-            res = orRESULT;
-            orSetTF( res, OT_TIME );
-            /* usec will always be positive. */
-            res->time.sec  = a->time.sec - btime.sec;
-            res->time.usec = a->time.usec - btime.usec;
-            /*
-            if( a->time.sec < time.sec )
-                res->time.sec = - res->time.sec;
-            */
+            orSeconds(a) -= orSeconds(b);
             return;
         }