EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

c++11 compilation issues

Browse Source 
references #28
This commit is contained in:
Matej Sekoranja
2016-03-23 22:04:09 +01:00
parent 85e881fbcd
commit 04a90c4780
10 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pvtoolsSrc/eget.cpp
View File

@ -30,7 +30,7 @@
#include "pvutils.cpp"
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -1769,7 +1769,7 @@ int main (int argc, char *argv[])
vector<Channel::shared_pointer> channels(nPvs);
for (int n = 0; n < nPvs; n++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
if (pvsAddress[n].empty())
channels[n] = getChannelProviderRegistry()->getProvider(providerNames[n])->createChannel(pvs[n], channelRequesterImpl);
else
@ -1847,7 +1847,7 @@ int main (int argc, char *argv[])
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
if (ca.empty())
channel = getChannelProviderRegistry()->getProvider(cp)->createChannel(cn, channelRequesterImpl);
else
@ -1857,14 +1857,14 @@ int main (int argc, char *argv[])
if (monitor)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
channelRequesterImpl->showDisconnectMessage();
// TODO remove this line, when CA provider will allow creation of monitors
// when channels is yet not connected
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
TR1::shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
channel->createMonitor(monitorRequesterImpl, pvRequest);
}
else
@ -1877,15 +1877,15 @@ int main (int argc, char *argv[])
else
{
/*
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
Channel::shared_pointer channel = provider->createChannel(pvs[n], channelRequesterImpl);
*/
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl;
TR1::shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl;
// probe for value field
// but only if there is only one PV request (otherwise mode change makes a mess)
@ -1912,7 +1912,7 @@ int main (int argc, char *argv[])
}
}
shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(
TR1::shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(
new ChannelGetRequesterImpl(channel->getChannelName(), false)
);
ChannelGet::shared_pointer channelGet = channel->createChannelGet(getRequesterImpl, pvRequest);
@ -2101,7 +2101,7 @@ int main (int argc, char *argv[])
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
Channel::shared_pointer channel =
authority.empty() ?
provider->createChannel(service, channelRequesterImpl) :
@ -2110,7 +2110,7 @@ int main (int argc, char *argv[])
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<ChannelRPCRequesterImpl> rpcRequesterImpl(new ChannelRPCRequesterImpl(channel->getChannelName()));
TR1::shared_ptr<ChannelRPCRequesterImpl> rpcRequesterImpl(new ChannelRPCRequesterImpl(channel->getChannelName()));
ChannelRPC::shared_pointer channelRPC = channel->createChannelRPC(rpcRequesterImpl, pvRequest);
if (rpcRequesterImpl->waitUntilConnected(timeOut))

14
pvtoolsSrc/pvget.cpp
View File

@ -23,7 +23,7 @@
#include <pv/caProvider.h>
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -577,7 +577,7 @@ int main (int argc, char *argv[])
vector<Channel::shared_pointer> channels(nPvs);
for (int n = 0; n < nPvs; n++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
if (pvAddresses[n].empty())
channels[n] = getChannelProviderRegistry()->getProvider(
providerNames[n])->createChannel(pvNames[n], channelRequesterImpl);
@ -591,11 +591,11 @@ int main (int argc, char *argv[])
for (int n = 0; n < nPvs; n++)
{
Channel::shared_pointer channel = channels[n];
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl;
TR1::shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl;
// probe for value field
if (mode == ValueOnlyMode)
@ -623,7 +623,7 @@ int main (int argc, char *argv[])
if (!monitor)
{
shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(new ChannelGetRequesterImpl(channel->getChannelName()));
TR1::shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(new ChannelGetRequesterImpl(channel->getChannelName()));
ChannelGet::shared_pointer channelGet = channel->createChannelGet(getRequesterImpl, pvRequest);
allOK &= getRequesterImpl->waitUntilGet(timeOut);
if (allOK)
@ -631,10 +631,10 @@ int main (int argc, char *argv[])
}
else
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
channelRequesterImpl->showDisconnectMessage();
shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
TR1::shared_ptr<MonitorRequesterImpl> monitorRequesterImpl(new MonitorRequesterImpl(channel->getChannelName()));
Monitor::shared_pointer monitorGet = channel->createMonitor(monitorRequesterImpl, pvRequest);
allOK &= true;
}

10
pvtoolsSrc/pvinfo.cpp
View File

@ -20,7 +20,7 @@
#include "pvutils.cpp"
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -151,7 +151,7 @@ int main (int argc, char *argv[])
URI uri;
bool validURI = URI::parse(pvs[n], uri);
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
std::string providerName(defaultProvider);
std::string pvName(pvs[n]);
@ -190,7 +190,7 @@ int main (int argc, char *argv[])
vector<Channel::shared_pointer> channels(nPvs);
for (int n = 0; n < nPvs; n++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
if (pvAddresses[n].empty())
channels[n] = getChannelProviderRegistry()->getProvider(
providerNames[n])->createChannel(pvNames[n], channelRequesterImpl);
@ -204,11 +204,11 @@ int main (int argc, char *argv[])
for (int n = 0; n < nPvs; n++)
{
Channel::shared_pointer channel = channels[n];
shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl = dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl(new GetFieldRequesterImpl(channel));
TR1::shared_ptr<GetFieldRequesterImpl> getFieldRequesterImpl(new GetFieldRequesterImpl(channel));
channel->getField(getFieldRequesterImpl, "");
if (getFieldRequesterImpl->waitUntilFieldGet(timeOut))

1
pvtoolsSrc/pvlist.cpp
View File

@ -35,7 +35,6 @@ int pclose(FILE *stream) {
#endif
using namespace std;
using namespace std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;

14
pvtoolsSrc/pvput.cpp
View File

@ -24,7 +24,7 @@
#include <pv/caProvider.h>
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -362,7 +362,7 @@ struct AtomicBoolean_null_deleter
void operator()(void const *) const {}
};
// standard performance on set/clear, use of tr1::shared_ptr lock-free counter for get
// standard performance on set/clear, use of TR1::shared_ptr lock-free counter for get
// alternative is to use boost::atomic
class AtomicBoolean
{
@ -384,8 +384,8 @@ public:
return counter.use_count() == 2;
}
private:
std::tr1::shared_ptr<void> counter;
std::tr1::shared_ptr<void> setp;
TR1::shared_ptr<void> counter;
TR1::shared_ptr<void> setp;
epics::pvData::Mutex mutex;
};
@ -654,7 +654,7 @@ int main (int argc, char *argv[])
URI uri;
bool validURI = URI::parse(pv, uri);
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
string providerName(defaultProvider);
string pvName(pv);
@ -737,7 +737,7 @@ int main (int argc, char *argv[])
do
{
// first connect
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
Channel::shared_pointer channel;
if (address.empty())
@ -750,7 +750,7 @@ int main (int argc, char *argv[])
if (channelRequesterImpl->waitUntilConnected(timeOut))
{
shared_ptr<ChannelPutRequesterImpl> putRequesterImpl(new ChannelPutRequesterImpl(channel->getChannelName()));
TR1::shared_ptr<ChannelPutRequesterImpl> putRequesterImpl(new ChannelPutRequesterImpl(channel->getChannelName()));
if (mode != TerseMode && !quiet)
std::cout << "Old : ";
ChannelPut::shared_pointer channelPut = channel->createChannelPut(putRequesterImpl, pvRequest);

13
pvtoolsSrc/pvutils.cpp
View File

@ -13,7 +13,8 @@
#include <pv/pvTimeStamp.h>
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -96,19 +97,19 @@ std::ostream& terse(std::ostream& o, PVField::shared_pointer const & pv)
o << *(pv.get());
return o;
case structure:
return terseStructure(o, static_pointer_cast<PVStructure>(pv));
return terseStructure(o, TR1::static_pointer_cast<PVStructure>(pv));
break;
case scalarArray:
return terseScalarArray(o, static_pointer_cast<PVScalarArray>(pv));
return terseScalarArray(o, TR1::static_pointer_cast<PVScalarArray>(pv));
break;
case structureArray:
return terseStructureArray(o, static_pointer_cast<PVStructureArray>(pv));
return terseStructureArray(o, TR1::static_pointer_cast<PVStructureArray>(pv));
break;
case union_:
return terseUnion(o, static_pointer_cast<PVUnion>(pv));
return terseUnion(o, TR1::static_pointer_cast<PVUnion>(pv));
break;
case unionArray:
return terseUnionArray(o, static_pointer_cast<PVUnionArray>(pv));
return terseUnionArray(o, TR1::static_pointer_cast<PVUnionArray>(pv));
break;
default:
std::ostringstream msg("unknown Field type: ");

20
src/rpcClient/rpcClient.cpp
View File

@ -20,7 +20,7 @@
using namespace epics::pvData;
using namespace std::tr1;
namespace TR1 = std::tr1;
using std::string;
namespace epics
@ -32,7 +32,7 @@ namespace pvAccess
class ChannelAndRPCRequesterImpl :
public enable_shared_from_this<ChannelAndRPCRequesterImpl>,
public TR1::enable_shared_from_this<ChannelAndRPCRequesterImpl>,
public virtual epics::pvAccess::ChannelRequester,
public virtual epics::pvAccess::ChannelRPCRequester
{
@ -237,7 +237,7 @@ void RPCClient::destroy()
bool RPCClient::connect(double timeout)
{
if (m_channel &&
dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester())->isRPCConnected())
TR1::dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester())->isRPCConnected())
return true;
issueConnect();
@ -249,7 +249,7 @@ void RPCClient::issueConnect()
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
// TODO try to reuse ChannelRequesterImpl instance (i.e. create only once)
shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl(new ChannelAndRPCRequesterImpl(m_pvRequest));
TR1::shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl(new ChannelAndRPCRequesterImpl(m_pvRequest));
m_channel = provider->createChannel(m_serviceName, channelRequesterImpl);
}
@ -258,8 +258,8 @@ bool RPCClient::waitConnect(double timeout)
if (!m_channel)
throw std::runtime_error("issueConnect() must be called before waitConnect()");
shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
TR1::shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
TR1::dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
return channelRequesterImpl->waitUntilRPCConnected(timeout) &&
channelRequesterImpl->isRPCConnected();
@ -288,16 +288,16 @@ void RPCClient::issueRequest(
if (!m_channel)
throw std::runtime_error("channel not connected");
shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
TR1::shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
TR1::dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
channelRequesterImpl->request(pvArgument, lastRequest);
}
PVStructure::shared_pointer RPCClient::waitResponse(double timeout)
{
shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
TR1::shared_ptr<ChannelAndRPCRequesterImpl> channelRequesterImpl =
TR1::dynamic_pointer_cast<ChannelAndRPCRequesterImpl>(m_channel->getChannelRequester());
if (channelRequesterImpl->waitForResponse(timeout))
{

90
testApp/remote/channelAccessIFTest.cpp
View File

@ -28,7 +28,7 @@
#include "testServer.cpp"
using namespace std::tr1;
namespace TR1 = std::tr1;
// int value, 1Hz increment by one
@ -152,7 +152,7 @@ int ChannelAccessIFTest::runAllTest() {
Channel::shared_pointer ChannelAccessIFTest::createChannel(string channelName, bool debug )
{
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl(debug));
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl(debug));
Channel::shared_pointer channel = getChannelProvider()->createChannel(channelName, channelReq);
return channel;
}
@ -161,12 +161,12 @@ Channel::shared_pointer ChannelAccessIFTest::createChannel(string channelName, b
Channel::shared_pointer ChannelAccessIFTest::syncCreateChannel(string channelName, bool debug )
{
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl(debug));
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl(debug));
Channel::shared_pointer channel = getChannelProvider()->createChannel(channelName, channelReq);
bool isConnected = channelReq->waitUntilStateChange(getTimeoutSec());
if (!isConnected) {
std::cerr << "[" << channelName << "] failed to connect to the channel. " << std::endl;
return shared_ptr<Channel>();
return TR1::shared_ptr<Channel>();
}
return channel;
@ -177,7 +177,7 @@ SyncChannelGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
Channel::shared_pointer const & channel, string const & request, bool debug )
{
shared_ptr<SyncChannelGetRequesterImpl>
TR1::shared_ptr<SyncChannelGetRequesterImpl>
channelGetReq(new SyncChannelGetRequesterImpl(channel->getChannelName(), debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
@ -186,7 +186,7 @@ SyncChannelGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
bool succStatus = channelGetReq->waitUntilGetDone(getTimeoutSec());
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to get. " << std::endl;
return shared_ptr<SyncChannelGetRequesterImpl>();
return TR1::shared_ptr<SyncChannelGetRequesterImpl>();
}
return channelGetReq;
}
@ -196,7 +196,7 @@ SyncChannelPutRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
Channel::shared_pointer const & channel, string const & request, bool debug )
{
shared_ptr<SyncChannelPutRequesterImpl>
TR1::shared_ptr<SyncChannelPutRequesterImpl>
channelPutReq(new SyncChannelPutRequesterImpl(channel->getChannelName(), debug));
@ -207,7 +207,7 @@ SyncChannelPutRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to create a put channel. " << std::endl;
return shared_ptr<SyncChannelPutRequesterImpl>();
return TR1::shared_ptr<SyncChannelPutRequesterImpl>();
}
return channelPutReq;
}
@ -217,7 +217,7 @@ SyncChannelPutGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateCh
Channel::shared_pointer const & channel, string const & request, bool debug )
{
shared_ptr<SyncChannelPutGetRequesterImpl>
TR1::shared_ptr<SyncChannelPutGetRequesterImpl>
channelPutGetReq(new SyncChannelPutGetRequesterImpl(debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
@ -227,7 +227,7 @@ SyncChannelPutGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateCh
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to create a put get channel. " << std::endl;
return shared_ptr<SyncChannelPutGetRequesterImpl>();
return TR1::shared_ptr<SyncChannelPutGetRequesterImpl>();
}
return channelPutGetReq;
}
@ -237,7 +237,7 @@ SyncChannelRPCRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
Channel::shared_pointer const & channel, bool debug )
{
shared_ptr<SyncChannelRPCRequesterImpl>
TR1::shared_ptr<SyncChannelRPCRequesterImpl>
channelRPCReq(new SyncChannelRPCRequesterImpl(debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(string());
@ -247,7 +247,7 @@ SyncChannelRPCRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to create a RPC channel. " << std::endl;
return shared_ptr<SyncChannelRPCRequesterImpl>();
return TR1::shared_ptr<SyncChannelRPCRequesterImpl>();
}
return channelRPCReq;
}
@ -256,7 +256,7 @@ SyncChannelRPCRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
SyncMonitorRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChannelMonitor(
Channel::shared_pointer const & channel, string const & request, bool debug )
{
shared_ptr<SyncMonitorRequesterImpl> monitorReq(new SyncMonitorRequesterImpl(debug));
TR1::shared_ptr<SyncMonitorRequesterImpl> monitorReq(new SyncMonitorRequesterImpl(debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
@ -265,7 +265,7 @@ SyncMonitorRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChannelM
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to create a monitor channel. " << std::endl;
return shared_ptr<SyncMonitorRequesterImpl>();
return TR1::shared_ptr<SyncMonitorRequesterImpl>();
}
return monitorReq;
}
@ -274,14 +274,14 @@ SyncMonitorRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChannelM
SyncChannelArrayRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChannelArray(
Channel::shared_pointer const & channel, PVStructure::shared_pointer pvRequest, bool debug )
{
shared_ptr<SyncChannelArrayRequesterImpl> arrayReq(new SyncChannelArrayRequesterImpl(debug));
TR1::shared_ptr<SyncChannelArrayRequesterImpl> arrayReq(new SyncChannelArrayRequesterImpl(debug));
channel->createChannelArray(arrayReq, pvRequest);
bool succStatus = arrayReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to create an array channel. " << std::endl;
return shared_ptr<SyncChannelArrayRequesterImpl>();
return TR1::shared_ptr<SyncChannelArrayRequesterImpl>();
}
return arrayReq;
}
@ -313,7 +313,7 @@ void ChannelAccessIFTest::test_createEmptyChannel() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
try {
Channel::shared_pointer channel = getChannelProvider()->createChannel(std::string(), channelReq);
@ -331,7 +331,7 @@ void ChannelAccessIFTest::test_createChannelWithInvalidPriority() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
try {
Channel::shared_pointer channel = getChannelProvider()->createChannel(std::string(), channelReq,
@ -350,7 +350,7 @@ void ChannelAccessIFTest::test_createChannel() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
Channel::shared_pointer channel = getChannelProvider()->createChannel(TEST_COUNTER_CHANNEL_NAME, channelReq);
bool succStatus = channelReq->waitUntilStateChange(getTimeoutSec());
if (!succStatus) {
@ -389,7 +389,7 @@ void ChannelAccessIFTest::test_findEmptyChannel() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
try {
std::tr1::shared_ptr<SyncChannelFindRequesterImpl> channelFindReq(new SyncChannelFindRequesterImpl());
TR1::shared_ptr<SyncChannelFindRequesterImpl> channelFindReq(new SyncChannelFindRequesterImpl());
getChannelProvider()->channelFind(std::string(), channelFindReq);
testFail("%s: empty channel name shoud never be allowed when searching for channels", CURRENT_FUNCTION);
return;
@ -405,7 +405,7 @@ void ChannelAccessIFTest::test_findChannel() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
std::tr1::shared_ptr<SyncChannelFindRequesterImpl> channelFindReq(new SyncChannelFindRequesterImpl());
TR1::shared_ptr<SyncChannelFindRequesterImpl> channelFindReq(new SyncChannelFindRequesterImpl());
getChannelProvider()->channelFind(TEST_COUNTER_CHANNEL_NAME, channelFindReq);
bool isFindResult = channelFindReq->waitUntilFindResult(getTimeoutSec());
if (!isFindResult) {
@ -421,7 +421,7 @@ void ChannelAccessIFTest::test_channel() {
testDiag("BEGIN TEST %s:", CURRENT_FUNCTION);
std::tr1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
TR1::shared_ptr<SyncChannelRequesterImpl> channelReq(new SyncChannelRequesterImpl());
Channel::shared_pointer channel = getChannelProvider()->createChannel(TEST_COUNTER_CHANNEL_NAME, channelReq);
bool succStatus = channelReq->waitUntilStateChange(getTimeoutSec());
if (!succStatus) {
@ -596,7 +596,7 @@ void ChannelAccessIFTest::test_channelGetIntProcessInternal(Channel::shared_poin
return;
}
std::tr1::shared_ptr<PVInt> value = channelGetReq->getPVStructure()->getSubField<PVInt>("value");
TR1::shared_ptr<PVInt> value = channelGetReq->getPVStructure()->getSubField<PVInt>("value");
PVTimeStamp pvTimeStamp;
@ -726,7 +726,7 @@ void ChannelAccessIFTest::test_channelPutNoProcess() {
return;
}
std::tr1::shared_ptr<PVDouble> value = channelPutReq->getPVStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> value = channelPutReq->getPVStructure()->getSubField<PVDouble>("value");
if (!value.get()) {
testFail("%s: getting double value field failed ", CURRENT_FUNCTION);
return;
@ -865,7 +865,7 @@ void ChannelAccessIFTest::test_channelPutIntProcessInternal(Channel::shared_poin
return;
}
std::tr1::shared_ptr<PVInt> value = channelPutReq->getPVStructure()->getSubField<PVInt>("value");
TR1::shared_ptr<PVInt> value = channelPutReq->getPVStructure()->getSubField<PVInt>("value");
if (!value.get()) {
testFail("%s: getting int value field failed ", testMethodName.c_str());
return;
@ -978,7 +978,7 @@ void ChannelAccessIFTest::test_channelGetFieldAll() {
return;
}
shared_ptr<SyncGetFieldRequesterImpl>
TR1::shared_ptr<SyncGetFieldRequesterImpl>
channelGetFieldReq(new SyncGetFieldRequesterImpl());
channel->getField(channelGetFieldReq, string());
@ -1008,7 +1008,7 @@ void ChannelAccessIFTest::test_channelGetFieldValue() {
return;
}
shared_ptr<SyncGetFieldRequesterImpl>
TR1::shared_ptr<SyncGetFieldRequesterImpl>
channelGetFieldReq(new SyncGetFieldRequesterImpl());
channel->getField(channelGetFieldReq, "value");
@ -1038,7 +1038,7 @@ void ChannelAccessIFTest::test_channelGetFieldInvalid() {
return;
}
shared_ptr<SyncGetFieldRequesterImpl>
TR1::shared_ptr<SyncGetFieldRequesterImpl>
channelGetFieldReq(new SyncGetFieldRequesterImpl());
channel->getField(channelGetFieldReq, "invalid");
@ -1111,7 +1111,7 @@ void ChannelAccessIFTest::test_channelProcess() {
testOk(true, "%s: syncGet the initial state", CURRENT_FUNCTION);
}
shared_ptr<SyncChannelProcessRequesterImpl>
TR1::shared_ptr<SyncChannelProcessRequesterImpl>
channelProcessReq(new SyncChannelProcessRequesterImpl());
@ -1260,7 +1260,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_putGet() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@ -1269,7 +1269,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_putGet() {
double initVal = 321.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@ -1339,7 +1339,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getPut() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@ -1348,7 +1348,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getPut() {
double initVal = 321.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@ -1416,7 +1416,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getGet() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@ -1425,7 +1425,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getGet() {
double initVal = 432.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
TR1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@ -1552,7 +1552,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
}
std::tr1::shared_ptr<PVInt> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVInt>("value");
TR1::shared_ptr<PVInt> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVInt>("value");
if (!putValue.get()) {
testFail("%s: getting put int value field failed ", CURRENT_FUNCTION);
return;
@ -1561,7 +1561,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
int initVal = 3;
putValue->put(initVal);
std::tr1::shared_ptr<PVInt> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVInt>("value");
TR1::shared_ptr<PVInt> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVInt>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get int value field failed ", CURRENT_FUNCTION);
return;
@ -1795,8 +1795,8 @@ void ChannelAccessIFTest::test_channelMonitor(int queueSize) {
testOk(monitorReq->getChangedBitSet()->get(0) == true, "%s: changeBitSet get(0) is true ", CURRENT_FUNCTION);
}
std::tr1::shared_ptr<PVField> valueField = monitorReq->getPVStructure()->getSubField("value");
std::tr1::shared_ptr<PVField> previousValue = getPVDataCreate()->createPVField(valueField->getField());
TR1::shared_ptr<PVField> valueField = monitorReq->getPVStructure()->getSubField("value");
TR1::shared_ptr<PVField> previousValue = getPVDataCreate()->createPVField(valueField->getField());
std::ostringstream oss;
//oss << *monitorReq->getChangedBitSet() << std::endl;
@ -1884,7 +1884,7 @@ void ChannelAccessIFTest::test_channelArray() {
return;
}
PVDoubleArrayPtr array = static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArrayPtr array = TR1::static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
/*bool*/ succStatus = arrayReq->syncGet(false, 0, 2, getTimeoutSec());
if (!succStatus) {
@ -1940,7 +1940,7 @@ void ChannelAccessIFTest::test_channelArray() {
}
PVDoubleArrayPtr array1 = static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArrayPtr array1 = TR1::static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArray::const_svector data1(array1->view());
testOk(data1[0] == 4.4 , "%s: 1.check 0: %f", CURRENT_FUNCTION, data1[0]);
testOk(data1[1] == 1.1 , "%s: 1.check 1: %f", CURRENT_FUNCTION, data1[1]);
@ -1962,7 +1962,7 @@ void ChannelAccessIFTest::test_channelArray() {
}
//checking 1.1 2.2 3.3
PVDoubleArrayPtr array2 = static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArrayPtr array2 = TR1::static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArray::const_svector data2(array2->view());
testOk(data2.size() == 3, "%s: data size after calling setLength should be 3 ",
CURRENT_FUNCTION);
@ -1984,7 +1984,7 @@ void ChannelAccessIFTest::test_channelArray() {
}
//checking 1.1 2.2
PVDoubleArrayPtr array3 = static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArrayPtr array3 = TR1::static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArray::const_svector data3(array3->view());
testOk(data3.size() == newLength,
"%s: data size after calling setLength should be %zu", CURRENT_FUNCTION, newLength);
@ -2005,7 +2005,7 @@ void ChannelAccessIFTest::test_channelArray() {
return;
}
PVDoubleArrayPtr array4 = static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArrayPtr array4 = TR1::static_pointer_cast<PVDoubleArray>(arrayReq->getArray());
PVDoubleArray::const_svector data4(array4->view());
testOk(data4.size() == bigCapacity, "%s: data size after calling setLength should be %zu",
CURRENT_FUNCTION, bigCapacity);
@ -2311,7 +2311,7 @@ void ChannelAccessIFTest::test_stressMonitorAndProcess() {
CURRENT_FUNCTION);
shared_ptr<SyncChannelProcessRequesterImpl>
TR1::shared_ptr<SyncChannelProcessRequesterImpl>
channelProcessReq(new SyncChannelProcessRequesterImpl(debug));
ChannelProcess::shared_pointer channelProcess =

14
testApp/remote/testGetPerformance.cpp
View File

@ -25,7 +25,7 @@
#include <pv/event.h>
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -45,7 +45,7 @@ int runs = DEFAULT_RUNS;
bool bulkMode = DEFAULT_BULK;
int arraySize = DEFAULT_ARRAY_SIZE; // 0 means scalar
Mutex waitLoopPtrMutex;
std::tr1::shared_ptr<Event> waitLoopEvent;
TR1::shared_ptr<Event> waitLoopEvent;
double timeOut = DEFAULT_TIMEOUT;
string request(DEFAULT_REQUEST);
@ -53,7 +53,7 @@ string request(DEFAULT_REQUEST);
PVStructure::shared_pointer pvRequest;
class RequesterImpl : public Requester,
public std::tr1::enable_shared_from_this<RequesterImpl>
public TR1::enable_shared_from_this<RequesterImpl>
{
public:
@ -315,7 +315,7 @@ void runTest()
i != channelNames.end();
i++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(
new ChannelRequesterImpl()
);
Channel::shared_pointer channel = provider->createChannel(*i, channelRequesterImpl);
@ -330,8 +330,8 @@ void runTest()
i++)
{
Channel::shared_pointer channel = *i;
shared_ptr<ChannelRequesterImpl> channelRequesterImpl =
dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl =
TR1::dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
if (channelRequesterImpl->waitUntilConnected(5.0))
{
string remoteAddress = channel->getRemoteAddress();
@ -351,7 +351,7 @@ void runTest()
}
}
shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(
TR1::shared_ptr<ChannelGetRequesterImpl> getRequesterImpl(
new ChannelGetRequesterImpl(channel->getChannelName())
);
ChannelGet::shared_pointer channelGet = channel->createChannelGet(getRequesterImpl, pvRequest);

14
testApp/remote/testMonitorPerformance.cpp
View File

@ -25,7 +25,7 @@
#include <pv/event.h>
using namespace std;
using namespace std::tr1;
namespace TR1 = std::tr1;
using namespace epics::pvData;
using namespace epics::pvAccess;
@ -43,7 +43,7 @@ int channels = DEFAULT_CHANNELS;
int runs = DEFAULT_RUNS;
int arraySize = DEFAULT_ARRAY_SIZE; // 0 means scalar
Mutex waitLoopPtrMutex;
std::tr1::shared_ptr<Event> waitLoopEvent;
TR1::shared_ptr<Event> waitLoopEvent;
double timeOut = DEFAULT_TIMEOUT;
string request(DEFAULT_REQUEST);
@ -51,7 +51,7 @@ string request(DEFAULT_REQUEST);
PVStructure::shared_pointer pvRequest;
class RequesterImpl : public Requester,
public std::tr1::enable_shared_from_this<RequesterImpl>
public TR1::enable_shared_from_this<RequesterImpl>
{
public:
@ -297,7 +297,7 @@ void runTest()
i != channelNames.end();
i++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(
new ChannelRequesterImpl()
);
Channel::shared_pointer channel = provider->createChannel(*i, channelRequesterImpl);
@ -311,8 +311,8 @@ void runTest()
i++)
{
Channel::shared_pointer channel = *i;
shared_ptr<ChannelRequesterImpl> channelRequesterImpl =
dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl =
TR1::dynamic_pointer_cast<ChannelRequesterImpl>(channel->getChannelRequester());
if (channelRequesterImpl->waitUntilConnected(5.0))
{
string remoteAddress = channel->getRemoteAddress();
@ -332,7 +332,7 @@ void runTest()
}
}
shared_ptr<ChannelMonitorRequesterImpl> getRequesterImpl(
TR1::shared_ptr<ChannelMonitorRequesterImpl> getRequesterImpl(
new ChannelMonitorRequesterImpl(channel->getChannelName())
);
Monitor::shared_pointer monitor = channel->createMonitor(getRequesterImpl, pvRequest);