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

placate MSVC, take 2

Browse Source
This commit is contained in:
Michael Davidsaver
2018-06-27 15:46:10 -07:00
parent dfd28f5474
commit a4f35714a0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testApp/testdbf_copy.cpp
View File

@ -123,12 +123,12 @@ template<typename input_t, typename output_t>
void testDBR2PVD_scalar(const input_t& input, void testDBR2PVD_scalar(const input_t& input,
const output_t& expect) const output_t& expect)
{ {
pvd::ScalarType IN = (pvd::ScalarType)pvd::ScalarTypeID<input_t>::value, pvd::ScalarType in = (pvd::ScalarType)pvd::ScalarTypeID<input_t>::value;
OUT = (pvd::ScalarType)pvd::ScalarTypeID<output_t>::value; pvd::ScalarType out = (pvd::ScalarType)pvd::ScalarTypeID<output_t>::value;
testDiag("testDBR2PVD_scalar(%s, %s)", pvd::ScalarTypeFunc::name(IN), pvd::ScalarTypeFunc::name(OUT)); testDiag("testDBR2PVD_scalar(%s, %s)", pvd::ScalarTypeFunc::name(in), pvd::ScalarTypeFunc::name(out));
pvd::PVStructure::shared_pointer top(pvd::getPVDataCreate()->createPVStructure(pvd::getFieldCreate()->createFieldBuilder() pvd::PVStructure::shared_pointer top(pvd::getPVDataCreate()->createPVStructure(pvd::getFieldCreate()->createFieldBuilder()
->add("value", OUT) // initially zero or "" ->add("value", out) // initially zero or ""
->createStructure())); ->createStructure()));
pvd::PVStringArray::const_svector choices; pvd::PVStringArray::const_svector choices;
pvd::BitSet changed; pvd::BitSet changed;