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

clear some warnings

Browse Source
This commit is contained in:
Michael Davidsaver
2017-12-28 12:53:52 -06:00
parent 43ee4b9cb6
commit cb7e4e858b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testApp/copy/testPVCopy.cpp
View File

@@ -41,7 +41,6 @@ static void testPVScalar(
PVScalarPtr pvValueMaster;
PVScalarPtr pvValueCopy;
BitSetPtr bitSet;
size_t offset;
ConvertPtr convert = getConvert();
pvValueMaster = pvMaster->getSubField<PVScalar>(valueNameMaster);
@@ -58,7 +57,7 @@ static void testPVScalar(
testOk1(convert->toDouble(pvValueCopy)==.06);
testOk1(bitSet->get(pvValueCopy->getFieldOffset()));
offset = pvCopy->getCopyOffset(pvValueMaster);
pvCopy->getCopyOffset(pvValueMaster);
bitSet->clear();
convert->fromDouble(pvValueMaster,1.0);
@@ -87,7 +86,6 @@ static void testPVScalarArray(
PVScalarArrayPtr pvValueMaster;
PVScalarArrayPtr pvValueCopy;
BitSetPtr bitSet;
size_t offset;
size_t n = 5;
shared_vector<double> values(n);
shared_vector<const double> cvalues;
@@ -113,7 +111,7 @@ static void testPVScalarArray(
pvValueCopy->getAs(cvalues);
testOk1(cvalues[0]==0.06);
offset = pvCopy->getCopyOffset(pvValueMaster);
pvCopy->getCopyOffset(pvValueMaster);
bitSet->clear();
values.resize(n);

4
testApp/misc/testTimeStamp.cpp
View File

@@ -30,7 +30,7 @@ void testTimeStampInternal()
testOk1(nanoSecPerSec==1000000000);
TimeStamp current;
current.getCurrent();
testDiag("current %lli %i milliSec %lli\n",
testDiag("current %lld %d milliSec %lld\n",
(long long)current.getSecondsPastEpoch(),
(int)current.getNanoseconds(),
(long long)current.getMilliseconds());
@@ -46,7 +46,7 @@ void testTimeStampInternal()
(ctm.tm_isdst==0) ? "false" : "true");
tt = time(&tt);
current.fromTime_t(tt);
testDiag("fromTime_t\ncurrent %lli %i milliSec %lli\n",
testDiag("fromTime_t\ncurrent %lld %d milliSec %lld\n",
(long long)current.getSecondsPastEpoch(),
(int)current.getNanoseconds(),
(long long)current.getMilliseconds());