From 8215244a282a616e31591d2bf6dc3a5d1ed9ca07 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 13 Mar 2015 10:06:23 -0500 Subject: [PATCH 1/3] Fix Windows time discontinuity report --- src/libCom/osi/os/WIN32/osdTime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp index fc35c7789..eb2c7ad9d 100644 --- a/src/libCom/osi/os/WIN32/osdTime.cpp +++ b/src/libCom/osi/os/WIN32/osdTime.cpp @@ -366,7 +366,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", From f6373093a54cf25ccebf5b29cf926d76dc2c57f1 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 13 Mar 2015 10:56:03 -0500 Subject: [PATCH 2/3] Fix Windows linkage warning in alarmString.h --- src/dbStatic/alarm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbStatic/alarm.h b/src/dbStatic/alarm.h index 6aaab449d..814da49f3 100644 --- a/src/dbStatic/alarm.h +++ b/src/dbStatic/alarm.h @@ -43,7 +43,7 @@ typedef enum { #define INVALID_ALARM epicsSevInvalid #define lastEpicsAlarmSev epicsSevInvalid -epicsShareExtern const char *epicsAlarmSeverityStrings [ALARM_NSEV]; +extern const char *epicsAlarmSeverityStrings [ALARM_NSEV]; /* ALARM STATUS - must match menuAlarmStat.dbd */ @@ -98,7 +98,7 @@ typedef enum { #define WRITE_ACCESS_ALARM epicsAlarmWriteAccess #define lastEpicsAlarmCond epicsAlarmWriteAccess -epicsShareExtern const char *epicsAlarmConditionStrings [ALARM_NSTATUS]; +extern const char *epicsAlarmConditionStrings [ALARM_NSTATUS]; #ifdef __cplusplus } From 5ffda58351c631d27e2656dd0ca05c0d7b5ef4aa Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 13 Mar 2015 11:08:05 -0500 Subject: [PATCH 3/3] ca: Fix missing guard argument --- src/ca/oldAccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h index 5684b83c3..40f0aee7c 100644 --- a/src/ca/oldAccess.h +++ b/src/ca/oldAccess.h @@ -591,7 +591,7 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO ( } else { // dont reverse the lock hierarchy - epicsGuardRelease < epicsMutex > guardRelease (); + epicsGuardRelease < epicsMutex > guardRelease ( guard ); { // // we will definately stall out here if all of the