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

win32 port: visibility, warnings, templates

Browse Source
This commit is contained in:
Matej Sekoranja
2013-11-27 01:11:12 +01:00
parent ccad38f2db
commit 301038664e
31 changed files with 141 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/factory/PVUnion.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ PVFieldPtr PVUnion::select(int32 index)
PVFieldPtr PVUnion::select(String const & fieldName)
{
int32 index = variant ? -1 : unionPtr->getFieldIndex(fieldName);
int32 index = variant ? -1 : static_cast<int32>(unionPtr->getFieldIndex(fieldName));
if (index == -1)
throw std::invalid_argument("no such fieldName");
return select(index);
@@ -175,7 +175,7 @@ void PVUnion::deserialize(ByteBuffer *pbuffer, DeserializableControl *pcontrol)
}
else
{
selector = SerializeHelper::readSize(pbuffer, pcontrol);
selector = static_cast<int32>(SerializeHelper::readSize(pbuffer, pcontrol));
if (selector != UNDEFINED_INDEX)
{
FieldConstPtr field = unionPtr->getField(selector);