From 4edff374d02e2cb0a5bc791e3619e5199d182d0f Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 29 Sep 2020 16:34:08 +0200 Subject: [PATCH] fix some type conversion warning on Windows --- src/devaaiStream.c | 8 ++++---- src/devaaoStream.c | 8 ++++---- src/devaoStream.c | 2 +- src/devlsiStream.c | 2 +- src/devlsoStream.c | 2 +- src/devwaveformStream.c | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/devaaiStream.c b/src/devaaiStream.c index 2074644..a54723a 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -171,10 +171,10 @@ static long writeData(dbCommon *record, format_t *format) break; #ifdef DBR_INT64 case DBF_INT64: - dval = ((epicsInt64 *)aai->bptr)[nowd]; + dval = (double)((epicsInt64 *)aai->bptr)[nowd]; break; case DBF_UINT64: - dval = ((epicsUInt64 *)aai->bptr)[nowd]; + dval = (double)((epicsUInt64 *)aai->bptr)[nowd]; break; #endif case DBF_LONG: @@ -214,10 +214,10 @@ static long writeData(dbCommon *record, format_t *format) { #ifdef DBR_INT64 case DBF_INT64: - lval = ((epicsInt64 *)aai->bptr)[nowd]; + lval = (long)((epicsInt64 *)aai->bptr)[nowd]; break; case DBF_UINT64: - lval = ((epicsUInt64 *)aai->bptr)[nowd]; + lval = (long)((epicsUInt64 *)aai->bptr)[nowd]; break; #endif case DBF_LONG: diff --git a/src/devaaoStream.c b/src/devaaoStream.c index 4f975a6..3799a4a 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -200,10 +200,10 @@ static long writeData(dbCommon *record, format_t *format) break; #ifdef DBR_INT64 case DBF_INT64: - dval = ((epicsInt64 *)aao->bptr)[nowd]; + dval = (double)((epicsInt64 *)aao->bptr)[nowd]; break; case DBF_UINT64: - dval = ((epicsUInt64 *)aao->bptr)[nowd]; + dval = (double)((epicsUInt64 *)aao->bptr)[nowd]; break; #endif case DBF_LONG: @@ -243,10 +243,10 @@ static long writeData(dbCommon *record, format_t *format) { #ifdef DBR_INT64 case DBF_INT64: - lval = ((epicsInt64 *)aao->bptr)[nowd]; + lval = (long)((epicsInt64 *)aao->bptr)[nowd]; break; case DBF_UINT64: - lval = ((epicsUInt64 *)aao->bptr)[nowd]; + lval = (long)((epicsUInt64 *)aao->bptr)[nowd]; break; #endif case DBF_LONG: diff --git a/src/devaoStream.c b/src/devaoStream.c index 59c6658..430e4b3 100644 --- a/src/devaoStream.c +++ b/src/devaoStream.c @@ -73,7 +73,7 @@ static long readData(dbCommon *record, format_t *format) if (record->pact) return DO_NOT_CONVERT; /* In @init handler, no processing, enforce monitor updates. */ ao->omod = ao->oval != val; - ao->orbv = ao->oval = val; + ao->orbv = (epicsInt32)(ao->oval = val); monitor_mask = recGblResetAlarms(record); if (!(fabs(ao->mlst - val) <= ao->mdel)) { diff --git a/src/devlsiStream.c b/src/devlsiStream.c index a639a16..353996c 100644 --- a/src/devlsiStream.c +++ b/src/devlsiStream.c @@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format) { lsi->val[length] = 0; } - lsi->len = length; + lsi->len = (epicsUInt32)length; return OK; } diff --git a/src/devlsoStream.c b/src/devlsoStream.c index 6599ad1..ae1bf70 100644 --- a/src/devlsoStream.c +++ b/src/devlsoStream.c @@ -39,7 +39,7 @@ static long readData(dbCommon *record, format_t *format) { lso->val[length] = 0; } - lso->len = length; + lso->len = (epicsUInt32)length; if (record->pact) return OK; /* In @init handler, no processing, enforce monitor updates. */ monitor_mask = recGblResetAlarms(record); diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index 535ba22..85892de 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -172,10 +172,10 @@ static long writeData(dbCommon *record, format_t *format) break; #ifdef DBR_INT64 case DBF_INT64: - dval = ((epicsInt64 *)wf->bptr)[nowd]; + dval = (double)((epicsInt64 *)wf->bptr)[nowd]; break; case DBF_UINT64: - dval = ((epicsUInt64 *)wf->bptr)[nowd]; + dval = (double)((epicsUInt64 *)wf->bptr)[nowd]; break; #endif case DBF_LONG: @@ -215,10 +215,10 @@ static long writeData(dbCommon *record, format_t *format) { #ifdef DBR_INT64 case DBF_INT64: - lval = ((epicsInt64 *)wf->bptr)[nowd]; + lval = (long)((epicsInt64 *)wf->bptr)[nowd]; break; case DBF_UINT64: - lval = ((epicsUInt64 *)wf->bptr)[nowd]; + lval = (long)((epicsUInt64 *)wf->bptr)[nowd]; break; #endif case DBF_LONG: