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

nanoSecond => nanosecond

Browse Source
This commit is contained in:
Marty Kraimer
2014-08-20 06:30:13 -04:00
parent 124972605a
commit eefd499adc
6 changed files with 1646 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/caChannel.cpp
+1 -1
View File
@@ -677,7 +677,7 @@ void copy_DBR_TIME(const void * dbr, unsigned count, PVStructure::shared_pointer
epics::pvData::int64 spe = data->stamp.secPastEpoch;
spe += 7305*86400;
ts->getLongField("secondsPastEpoch")->put(spe);
ts->getIntField("nanoSeconds")->put(data->stamp.nsec);
ts->getIntField("nanoseconds")->put(data->stamp.nsec);
copy_DBR<pT, sT, sF, aF>(&data->value, count, pvStructure);
}
src/server/serverContext.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ void ServerContextImpl::generateGUID()
ByteBuffer buffer(_guid.value, sizeof(_guid.value));
buffer.putLong(startupTime.getSecondsPastEpoch());
buffer.putInt(startupTime.getNanoSeconds());
buffer.putInt(startupTime.getNanoseconds());
}
void ServerContextImpl::initializeLogger()