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

replace all internal use of getChannelProviderRegistry()

Browse Source
This commit is contained in:
Michael Davidsaver
2017-06-28 13:48:02 +02:00
parent 3d5696b644
commit 749e8d71d1
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pvtoolsSrc/eget.cpp
View File

@@ -1699,7 +1699,7 @@ int main (int argc, char *argv[])
// skip trailing '/'
pvs.push_back(uri.path.substr(1));
pvsAddress.push_back(uri.host);
providers.push_back(getChannelProviderRegistry()->getProvider(uri.protocol));
providers.push_back(ChannelProviderRegistry::clients()->getProvider(uri.protocol));
if(!providers.back()) {
std::cerr<<"Unknown provider \""<<uri.protocol<<"\" for \""<<pvs.back()<<"\n";
allOK = false;
@@ -1741,14 +1741,14 @@ int main (int argc, char *argv[])
// skip trailing '/'
pvs.push_back(uri.path.substr(1));
pvsAddress.push_back(uri.host);
providers.push_back(getChannelProviderRegistry()->getProvider(uri.protocol));
providers.push_back(ChannelProviderRegistry::clients()->getProvider(uri.protocol));
}
else
{
uri.protocol = defaultProvider;
pvs.push_back(uris[n]);
pvsAddress.push_back(std::string());
providers.push_back(getChannelProviderRegistry()->getProvider(defaultProvider));
providers.push_back(ChannelProviderRegistry::clients()->getProvider(defaultProvider));
}
if(!providers.back()) {
@@ -2050,7 +2050,7 @@ int main (int argc, char *argv[])
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
ChannelProvider::shared_pointer provider = ChannelProviderRegistry::clients()->getProvider("pva");
assert(provider);
TR1::shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));

2
pvtoolsSrc/pvget.cpp
View File

@@ -548,7 +548,7 @@ int main (int argc, char *argv[])
pvNames.push_back(pvName);
pvAddresses.push_back(address);
providers.push_back(getChannelProviderRegistry()->getProvider(providerName));
providers.push_back(ChannelProviderRegistry::clients()->getProvider(providerName));
if(!providers.back()) {
std::cerr<<"Unknown provider \""<<providerName<<"\" for channel "<<pvs[n]<<"\n";
allOK = false;

2
pvtoolsSrc/pvinfo.cpp
View File

@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
pvNames.push_back(pvName);
pvAddresses.push_back(address);
providers.push_back(getChannelProviderRegistry()->getProvider(providerName));
providers.push_back(ChannelProviderRegistry::clients()->getProvider(providerName));
if(!providers.back())
{
std::cerr << "unknown provider name '" << providerName

2
pvtoolsSrc/pvput.cpp
View File

@@ -640,7 +640,7 @@ int main (int argc, char *argv[])
ClientFactory::start();
epics::pvAccess::ca::CAClientFactory::start();
ChannelProvider::shared_pointer provider(getChannelProviderRegistry()->getProvider(providerName));
ChannelProvider::shared_pointer provider(ChannelProviderRegistry::clients()->getProvider(providerName));
if(!provider) {
std::cerr << "Unknown provider '"<<providerName<<"'\n";
return 1;

2
src/factory/ChannelAccessFactory.cpp
View File

@@ -175,7 +175,7 @@ struct CompatRegistry : public ChannelProviderRegistry
virtual bool add(const ChannelProviderFactory::shared_pointer& fact, bool replace=true) OVERRIDE FINAL
{
std::cerr<<"Warning: Adding provider \""<<fact->getFactoryName()<<"\" to compatibility ChannelProviderFactory is deprecated\n"
<<" Instead explicitly add to ChannelProviderFactory::clients() or ChannelProviderFactory::servers()\n";
<<" Instead explicitly add to ChannelProviderRegistry::clients() or ChannelProviderRegistry::servers()\n";
// intentionally not using short-circuit or
return clients()->add(fact, replace) | servers()->add(fact, replace);
}

2
testApp/remote/testChannelConnect.cpp
View File

@@ -125,7 +125,7 @@ int main (int argc, char *argv[])
Event g_event;
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
ChannelProvider::shared_pointer provider = ChannelProviderRegistry::clients()->getProvider("pva");
int run = 0;

2
testApp/remote/testClientFactory.cpp
View File

@@ -5,7 +5,7 @@
int main()
{
epics::pvAccess::ClientFactory::start();
epics::pvAccess::getChannelProviderRegistry()->getProvider("pva");
epics::pvAccess::ChannelProviderRegistry::clients()->getProvider("pva");
epics::pvAccess::ClientFactory::stop();
//epicsThreadSleep ( 3.0 );

2
testApp/remote/testGetPerformance.cpp
View File

@@ -457,7 +457,7 @@ int main (int argc, char *argv[])
}
ClientFactory::start();
provider = getChannelProviderRegistry()->getProvider("pva");
provider = ChannelProviderRegistry::clients()->getProvider("pva");
if (!testFile.empty())
{

2
testApp/remote/testMonitorPerformance.cpp
View File

@@ -434,7 +434,7 @@ int main (int argc, char *argv[])
}
ClientFactory::start();
provider = getChannelProviderRegistry()->getProvider("pva");
provider = ChannelProviderRegistry::clients()->getProvider("pva");
if (!testFile.empty())
{

2
testApp/remote/testRAII.cpp
View File

@@ -93,7 +93,7 @@ int main()
pva::ClientFactory::start();
pva::ChannelProvider::shared_pointer provider =
pva::getChannelProviderRegistry()->getProvider("pva");
pva::ChannelProviderRegistry::clients()->getProvider("pva");
{

2
testApp/remote/testRemoteClientImpl.cpp
View File

@@ -373,7 +373,7 @@ int main()
{
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
ChannelProvider::shared_pointer provider = ChannelProviderRegistry::clients()->getProvider("pva");
ChannelFindRequester::shared_pointer findRequester(new ChannelFindRequesterImpl());
ChannelFind::shared_pointer channelFind = provider->channelFind("testSomething", findRequester);