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

win32 vs2013 compilation fix

Browse Source
This commit is contained in:
Matej Sekoranja
2014-11-11 09:05:25 +01:00
parent f1c39ca5d2
commit b4e17f271b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/src/testPVCopy.cpp
View File

@ -236,21 +236,21 @@ static void scalarTest()
valueNameRecord = request = "value"; valueNameRecord = request = "value";
CreateRequest::shared_pointer createRequest = CreateRequest::create(); CreateRequest::shared_pointer createRequest = CreateRequest::create();
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = ""; request = "";
valueNameRecord = "value"; valueNameRecord = "value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = "alarm,timeStamp,value"; request = "alarm,timeStamp,value";
valueNameRecord = "value"; valueNameRecord = "value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
@ -273,21 +273,21 @@ static void arrayTest()
pvRecord = createScalarArray("doubleArrayRecord",pvDouble,"alarm,timeStamp"); pvRecord = createScalarArray("doubleArrayRecord",pvDouble,"alarm,timeStamp");
valueNameRecord = request = "value"; valueNameRecord = request = "value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = ""; request = "";
valueNameRecord = "value"; valueNameRecord = "value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = "alarm,timeStamp,value"; request = "alarm,timeStamp,value";
valueNameRecord = "value"; valueNameRecord = "value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "value"; valueNameCopy = "value";
testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalarArray(pvDouble,valueNameRecord,valueNameCopy,pvRecord,pvCopy);
@ -311,28 +311,28 @@ static void powerSupplyTest()
pvRecord = PowerSupply::create("powerSupply",pv); pvRecord = PowerSupply::create("powerSupply",pv);
valueNameRecord = request = "power.value"; valueNameRecord = request = "power.value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "power.value"; valueNameCopy = "power.value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = ""; request = "";
valueNameRecord = "power.value"; valueNameRecord = "power.value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "power.value"; valueNameCopy = "power.value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = "alarm,timeStamp,voltage.value,power.value,current.value"; request = "alarm,timeStamp,voltage.value,power.value,current.value";
valueNameRecord = "power.value"; valueNameRecord = "power.value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "power.value"; valueNameCopy = "power.value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
request = "alarm,timeStamp,voltage{value,alarm},power{value,alarm,display},current.value"; request = "alarm,timeStamp,voltage{value,alarm},power{value,alarm,display},current.value";
valueNameRecord = "power.value"; valueNameRecord = "power.value";
pvRequest = createRequest->createRequest(request); pvRequest = createRequest->createRequest(request);
cout << "request " << request << endl << "pvRequest" << pvRequest->dumpValue(cout) << endl ; cout << "request " << request << endl << "pvRequest" << *pvRequest << endl ;
pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,""); pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
valueNameCopy = "power.value"; valueNameCopy = "power.value";
testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy); testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);