From f2b43b704c9632aa5ac855f3a2453a29076f888d Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Wed, 26 Nov 2014 14:12:09 +0100 Subject: [PATCH] rtems compilation warnings (int32 != int) --- testApp/misc/testTimeStamp.cpp | 8 ++++---- testApp/property/testProperty.cpp | 8 ++++---- testApp/pv/testPVType.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testApp/misc/testTimeStamp.cpp b/testApp/misc/testTimeStamp.cpp index c7bfd53..b748f9a 100644 --- a/testApp/misc/testTimeStamp.cpp +++ b/testApp/misc/testTimeStamp.cpp @@ -35,7 +35,7 @@ void testTimeStampInternal() current.getCurrent(); printf("current %lli %i milliSec %lli\n", (long long)current.getSecondsPastEpoch(), - current.getNanoseconds(), + (int)current.getNanoseconds(), (long long)current.getMilliseconds()); time_t tt; current.toTime_t(tt); @@ -45,13 +45,13 @@ void testTimeStampInternal() "%4.4d.%2.2d.%2.2d %2.2d:%2.2d:%2.2d %d isDst %s\n", ctm.tm_year+1900,ctm.tm_mon + 1,ctm.tm_mday, ctm.tm_hour,ctm.tm_min,ctm.tm_sec, - current.getNanoseconds(), + (int)current.getNanoseconds(), (ctm.tm_isdst==0) ? "false" : "true"); tt = time(&tt); current.fromTime_t(tt); printf("fromTime_t\ncurrent %lli %i milliSec %lli\n", (long long)current.getSecondsPastEpoch(), - current.getNanoseconds(), + (int)current.getNanoseconds(), (long long)current.getMilliseconds()); current.toTime_t(tt); memcpy(&ctm,localtime(&tt),sizeof(struct tm)); @@ -59,7 +59,7 @@ void testTimeStampInternal() "%4.4d.%2.2d.%2.2d %2.2d:%2.2d:%2.2d %d isDst %s\n", ctm.tm_year+1900,ctm.tm_mon + 1,ctm.tm_mday, ctm.tm_hour,ctm.tm_min,ctm.tm_sec, - current.getNanoseconds(), + (int)current.getNanoseconds(), (ctm.tm_isdst==0) ? "false" : "true"); TimeStamp right; TimeStamp left; diff --git a/testApp/property/testProperty.cpp b/testApp/property/testProperty.cpp index aaf4571..53a3e96 100644 --- a/testApp/property/testProperty.cpp +++ b/testApp/property/testProperty.cpp @@ -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