Merged changes from 3.14 branch up to revno 12573

2015-03-13 11:50:26 -05:00
parent 99f1dbb75e 5ffda58351
commit e1b2a0c5a3
1 changed files with 1 additions and 1 deletions
@@ -390,7 +390,7 @@ void currentTime::getCurrentTime ( epicsTimeStamp & dest )
        LONGLONG epicsTimeCurrent = this->epicsTimeLast + offset;
        if ( this->epicsTimeLast > epicsTimeCurrent ) {
            double diff = static_cast < double >
-                ( this->epicsTimeLast - epicsTimeCurrent );
+                ( this->epicsTimeLast - epicsTimeCurrent ) / EPICS_TIME_TICKS_PER_SEC;
            errlogPrintf (
                "currentTime::getCurrentTime(): %f sec "
                "time discontinuity detected\n",