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

solaris compiler does not like member w name of the struct

Browse Source
This commit is contained in:
Jeff Hill
1999-08-06 00:41:42 +00:00
parent ec76f36f4c
commit f2fca5dd5e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libCom/osiTime.cc
View File

@@ -237,7 +237,7 @@ osiTime::operator tm_nano_sec () const
ansiTimeTicks = *this;
// from POSIX RT
localtime_r (&ansiTimeTicks.ts, &tm.tm);
localtime_r (&ansiTimeTicks.ts, &tm.ansi_tm);
tm.nsec = this->nSec;
@@ -250,7 +250,7 @@ osiTime::operator tm_nano_sec () const
osiTime::osiTime (const struct tm_nano_sec &tm)
{
time_t ansiTimeTicks;
struct tm tmp = tm.tm;
struct tm tmp = tm.ansi_tm;
ansiTimeTicks = mktime (&tmp);
assert (ansiTimeTicks!=(time_t)-1);
@@ -280,13 +280,13 @@ inline osiTime::osiTime (const struct timespec &ts)
{
this->sec = osiTime::time_tToInternalSec (ts.tv_sec);
assert (ts.tv_nsec>=0);
unsigned long nSec = static_cast<unsigned long> (ts.tv_nsec);
if (nSec<nSecPerSec) {
this->nSec = nSec;
unsigned long nSecIn = static_cast<unsigned long> (ts.tv_nsec);
if (nSecIn<nSecPerSec) {
this->nSec = nSecIn;
}
else {
this->sec += nSec / nSecPerSec;
this->nSec = nSec % nSecPerSec;
this->sec += nSecIn / nSecPerSec;
this->nSec = nSecIn % nSecPerSec;
}
}
@@ -349,7 +349,7 @@ void osiTime::show (unsigned) const
char bigBuffer[256];
tm_nano_sec tmns = *this;
status = strftime (bigBuffer, sizeof(bigBuffer), "%c", &tmns.tm);
status = strftime (bigBuffer, sizeof(bigBuffer), "%c", &tmns.ansi_tm);
if (status>0) {
printf ("osiTime: %s %f\n", bigBuffer,
static_cast <double> (tmns.nsec) / nSecPerSec);

2
src/libCom/osiTime.h
View File

@@ -47,7 +47,7 @@ struct timespec; // POSIX real time
// an extended ANSI C RTL "struct tm" which includes nano seconds.
//
struct tm_nano_sec {
tm tm; // ANSI C time details
tm ansi_tm; // ANSI C time details
unsigned long nsec; // nano seconds extension
};