fixed mantis 266

epicsTime <=> aitTimeStamp conversions dont work on 64 bit hosts
This commit is contained in:
Jeff Hill
2006-06-29 15:28:36 +00:00
parent eff6f305c8
commit b3ff995884
4 changed files with 26 additions and 55 deletions

View File

@@ -200,6 +200,24 @@ aitTimeStamp aitTimeStamp::operator = (const struct epicsTimeStamp &rhs)
return *this;
}
aitTimeStamp :: aitTimeStamp ( const epicsTime & ts )
{
epicsTimeStamp ets = ts;
*this = ets;
}
aitTimeStamp aitTimeStamp :: operator = ( const epicsTime & rhs )
{
epicsTimeStamp ets = rhs;
return *this = ets;
}
aitTimeStamp :: operator epicsTime () const
{
epicsTimeStamp ets = *this;
return epicsTime ( ets );
}
aitTimeStamp::operator struct timespec () const
{
struct timespec ts;

View File

@@ -39,6 +39,7 @@ inline char* strDup(const char* x)
struct timespec;
struct epicsTimeStamp;
class epicsTime;
class gdd;
class epicsShareClass aitTimeStamp {
@@ -102,8 +103,13 @@ public:
//
operator struct epicsTimeStamp () const;
void get (struct epicsTimeStamp &) const;
aitTimeStamp (const struct epicsTimeStamp &ts);
aitTimeStamp operator = (const struct epicsTimeStamp &rhs);
aitTimeStamp (const epicsTimeStamp &ts);
aitTimeStamp operator = (const epicsTimeStamp &rhs);
// conversion to from epicsTime
aitTimeStamp (const epicsTime &ts);
aitTimeStamp operator = (const epicsTime &rhs);
operator epicsTime () const;
static aitTimeStamp getCurrent();