epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Let's make timeStamp constants actually const

Browse Source
This commit is contained in:
Andrew Johnson
2017-11-07 11:46:36 -06:00
parent fc38dff3b0
commit 7979238029
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/property/pv/timeStamp.h
View File

@@ -19,10 +19,10 @@
namespace epics { namespace pvData {
epicsShareExtern int32 milliSecPerSec;
epicsShareExtern int32 microSecPerSec;
epicsShareExtern int32 nanoSecPerSec;
epicsShareExtern int64 posixEpochAtEpicsEpoch;
epicsShareExtern const int32 milliSecPerSec;
epicsShareExtern const int32 microSecPerSec;
epicsShareExtern const int32 nanoSecPerSec;
epicsShareExtern const int64 posixEpochAtEpicsEpoch;
/** @brief Methods for manipulating timeStamp.
*

8
src/property/timeStamp.cpp
View File

@@ -21,10 +21,10 @@
namespace epics { namespace pvData {
int32 milliSecPerSec = 1000;
int32 microSecPerSec = milliSecPerSec*milliSecPerSec;
int32 nanoSecPerSec = milliSecPerSec*microSecPerSec;
int64 posixEpochAtEpicsEpoch = POSIX_TIME_AT_EPICS_EPOCH;
const int32 milliSecPerSec = 1000;
const int32 microSecPerSec = 1000000;
const int32 nanoSecPerSec = 1000000000;
const int64 posixEpochAtEpicsEpoch = POSIX_TIME_AT_EPICS_EPOCH;
TimeStamp::TimeStamp(int64 secondsPastEpoch,int32 nanoseconds,int32 userTag)
: secondsPastEpoch(secondsPastEpoch),nanoseconds(nanoseconds),userTag(userTag)