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

rtems compilation warnings (int32 != int)

Browse Source
This commit is contained in:
Matej Sekoranja
2014-11-26 14:12:09 +01:00
parent de1478d7ba
commit f2b43b704c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testApp/property/testProperty.cpp
View File

@@ -131,9 +131,9 @@ static void testTimeStamp()
"%4.4d.%2.2d.%2.2d %2.2d:%2.2d:%2.2d %d nanoseconds isDst %s userTag %d\n",
ctm.tm_year+1900,ctm.tm_mon + 1,ctm.tm_mday,
ctm.tm_hour,ctm.tm_min,ctm.tm_sec,
timeStamp.getNanoseconds(),
(int)timeStamp.getNanoseconds(),
(ctm.tm_isdst==0) ? "false" : "true",
timeStamp.getUserTag());
(int)timeStamp.getUserTag());
}
timeStamp.put(0,0);
pvTimeStamp.set(timeStamp);
@@ -217,14 +217,14 @@ static void testEnumerated()
PVStringArray::const_svector choices = pvEnumerated.getChoices();
int32 numChoices = pvEnumerated.getNumberChoices();
if(debug) {
printf("index %d choice %s choices",index,choice.c_str());
printf("index %d choice %s choices",(int)index,choice.c_str());
for(int i=0; i<numChoices; i++ ) printf(" %s",choices[i].c_str());
printf("\n");
}
pvEnumerated.setIndex(2);
index = pvEnumerated.getIndex();
choice = pvEnumerated.getChoice();
if(debug) printf("index %d choice %s\n",index,choice.c_str());
if(debug) printf("index %d choice %s\n",(int)index,choice.c_str());
printf("testEnumerated PASSED\n");
}