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

removed constants

Browse Source
This commit is contained in:
Jeff Hill
2002-10-23 22:17:57 +00:00
parent 1af30b1d48
commit 6b3c5002ec
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libCom/osi/epicsTime.cpp
View File

@@ -29,11 +29,11 @@ static const char *id = "@(#) " EPICS_VERSION_STRING ", Common Utilities Library
//
// useful public constants
//
const unsigned epicsTime::mSecPerSec = 1000u;
const unsigned epicsTime::uSecPerSec = 1000u*epicsTime::mSecPerSec;
const unsigned epicsTime::nSecPerSec = 1000u*epicsTime::uSecPerSec;
const unsigned epicsTime::nSecPerUSec = 1000u;
const unsigned epicsTime::secPerMin = 60u;
static const unsigned mSecPerSec = 1000u;
static const unsigned uSecPerSec = 1000u * mSecPerSec;
static const unsigned nSecPerSec = 1000u * uSecPerSec;
static const unsigned nSecPerUSec = 1000u;
static const unsigned secPerMin = 60u;
//
// force this module to include code that can convert
@@ -385,8 +385,8 @@ epicsTime::epicsTime (const aitTimeStamp &ts)
ansiTimeTicks.ts = ts.tv_sec;
*this = epicsTime (ansiTimeTicks);
unsigned long secAdj = ts.tv_nsec / epicsTime::nSecPerSec;
unsigned long nSecAdj = ts.tv_nsec % epicsTime::nSecPerSec;
unsigned long secAdj = ts.tv_nsec / nSecPerSec;
unsigned long nSecAdj = ts.tv_nsec % nSecPerSec;
*this = epicsTime (this->secPastEpoch+secAdj, this->nSec+nSecAdj);
}

7
src/libCom/osi/epicsTime.h
View File

@@ -152,13 +152,6 @@ public:
// dump current state to standard out
void show ( unsigned interestLevel ) const;
// useful public constants
static const unsigned secPerMin;
static const unsigned mSecPerSec;
static const unsigned uSecPerSec;
static const unsigned nSecPerSec;
static const unsigned nSecPerUSec;
private:
// private because:
// a) application does not break when EPICS epoch is changed