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

major changes to monitor. Bug in Convert::copyScalar (change every break to rerurn); minor change to StandardPVField and queueVoid

Browse Source
This commit is contained in:
Marty Kraimer
2011-04-05 08:37:16 -04:00
parent 617871ece9
commit 323a2d7321
8 changed files with 230 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pvDataApp/factory/Convert.cpp
View File

@@ -315,49 +315,49 @@ void Convert::copyScalar(PVScalar *from, PVScalar *to)
PVBoolean *dataTo = static_cast<PVBoolean*>(to);
dataTo->put(value);
}
break;
return;
}
case pvByte : {
PVByte *data = static_cast<PVByte*>(from);
int8 value = data->get();
convert->fromByte(to,value);
break;
return;
}
case pvShort : {
PVShort *data = static_cast<PVShort*>(from);
short value = data->get();
convert->fromShort(to,value);
break;
return;
}
case pvInt :{
PVInt *data = static_cast<PVInt*>(from);
int value = data->get();
convert->fromInt(to,value);
break;
return;
}
case pvLong : {
PVLong *data = static_cast<PVLong*>(from);
long value = data->get();
convert->fromLong(to,value);
break;
return;
}
case pvFloat : {
PVFloat *data = static_cast<PVFloat*>(from);
float value = data->get();
convert->fromFloat(to,value);
break;
return;
}
case pvDouble : {
PVDouble *data = static_cast<PVDouble*>(from);
double value = data->get();
convert->fromDouble(to,value);
break;
return;
}
case pvString: {
PVString *data = static_cast<PVString*>(from);
String value = data->get();
convert->fromString(to,value);
break;
return;
}
}
String message("Convert::copyScalar should never get here");