diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp index 3201ab8..2e7b982 100644 --- a/pvDataApp/factory/Convert.cpp +++ b/pvDataApp/factory/Convert.cpp @@ -233,43 +233,43 @@ void fromScalar(PVScalarPtr const &pv,T from) throw std::logic_error("byte can not be converted to boolean"); case pvByte: { PVBytePtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvShort: { PVShortPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvInt: { PVIntPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvLong: { PVLongPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvUByte: { PVUBytePtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvUShort: { PVUShortPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvUInt: { PVUIntPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvULong: { PVULongPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvFloat: { PVFloatPtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvDouble: { PVDoublePtr value = static_pointer_cast(pv); - value->put(from); return; + value->put(static_cast(from)); return; } case pvString: { PVStringPtr pvvalue = static_pointer_cast(pv); @@ -1705,7 +1705,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVByteArray *pvdata = static_cast(pv); int8 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1719,7 +1719,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVShortArray *pvdata = static_cast(pv); int16 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1733,7 +1733,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVIntArray *pvdata = static_cast(pv); int32 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1747,7 +1747,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVLongArray *pvdata = static_cast(pv); int64 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1761,7 +1761,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVUByteArray *pvdata = static_cast(pv); uint8 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1775,7 +1775,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVUShortArray *pvdata = static_cast(pv); uint16 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1789,7 +1789,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVUIntArray *pvdata = static_cast(pv); uint32 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1803,7 +1803,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVULongArray *pvdata = static_cast(pv); uint64 data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1817,7 +1817,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVFloatArray *pvdata = static_cast(pv); float data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -1831,7 +1831,7 @@ size_t convertFromScalarArray(PVScalarArray *pv, PVDoubleArray *pvdata = static_cast(pv); double data[1]; while (len > 0) { - data[0] = from[fromOffset]; + data[0] = static_cast(from[fromOffset]); if (pvdata->put(offset, 1, data, 0) == 0) return ntransfered; --len; @@ -2008,7 +2008,7 @@ size_t convertToScalarArray(PVScalarArray *pv, FloatArray dataArray = data.data; size_t dataOffset = data.offset; for (size_t i = 0; i < num; i++) - to[i + toOffset] = dataArray[i + dataOffset]; + to[i + toOffset] = static_cast(dataArray[i + dataOffset]); len -= num; offset += num; toOffset += num; @@ -2026,7 +2026,7 @@ size_t convertToScalarArray(PVScalarArray *pv, DoubleArray dataArray = data.data; size_t dataOffset = data.offset; for (size_t i = 0; i < num; i++) - to[i + toOffset] = dataArray[i + dataOffset]; + to[i + toOffset] = static_cast(dataArray[i + dataOffset]); len -= num; offset += num; toOffset += num;