From 749e8d71d126516d3254917dc56838774efe51f5 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 28 Jun 2017 13:48:02 +0200 Subject: [PATCH] replace all internal use of getChannelProviderRegistry() --- pvtoolsSrc/eget.cpp | 8 ++++---- pvtoolsSrc/pvget.cpp | 2 +- pvtoolsSrc/pvinfo.cpp | 2 +- pvtoolsSrc/pvput.cpp | 2 +- src/factory/ChannelAccessFactory.cpp | 2 +- testApp/remote/testChannelConnect.cpp | 2 +- testApp/remote/testClientFactory.cpp | 2 +- testApp/remote/testGetPerformance.cpp | 2 +- testApp/remote/testMonitorPerformance.cpp | 2 +- testApp/remote/testRAII.cpp | 2 +- testApp/remote/testRemoteClientImpl.cpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pvtoolsSrc/eget.cpp b/pvtoolsSrc/eget.cpp index 668babe..a039926 100644 --- a/pvtoolsSrc/eget.cpp +++ b/pvtoolsSrc/eget.cpp @@ -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 \""<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(new ChannelRequesterImpl(quiet)); diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index d7121a5..ab8d2c8 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -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 \""<getProvider(providerName)); + providers.push_back(ChannelProviderRegistry::clients()->getProvider(providerName)); if(!providers.back()) { std::cerr << "unknown provider name '" << providerName diff --git a/pvtoolsSrc/pvput.cpp b/pvtoolsSrc/pvput.cpp index e80bf44..52d68b5 100644 --- a/pvtoolsSrc/pvput.cpp +++ b/pvtoolsSrc/pvput.cpp @@ -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 '"<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); } diff --git a/testApp/remote/testChannelConnect.cpp b/testApp/remote/testChannelConnect.cpp index f369133..1a42959 100644 --- a/testApp/remote/testChannelConnect.cpp +++ b/testApp/remote/testChannelConnect.cpp @@ -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; diff --git a/testApp/remote/testClientFactory.cpp b/testApp/remote/testClientFactory.cpp index 9b188b1..e8d59d7 100644 --- a/testApp/remote/testClientFactory.cpp +++ b/testApp/remote/testClientFactory.cpp @@ -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 ); diff --git a/testApp/remote/testGetPerformance.cpp b/testApp/remote/testGetPerformance.cpp index ae12502..6438830 100644 --- a/testApp/remote/testGetPerformance.cpp +++ b/testApp/remote/testGetPerformance.cpp @@ -457,7 +457,7 @@ int main (int argc, char *argv[]) } ClientFactory::start(); - provider = getChannelProviderRegistry()->getProvider("pva"); + provider = ChannelProviderRegistry::clients()->getProvider("pva"); if (!testFile.empty()) { diff --git a/testApp/remote/testMonitorPerformance.cpp b/testApp/remote/testMonitorPerformance.cpp index 58b1970..6b76a5f 100644 --- a/testApp/remote/testMonitorPerformance.cpp +++ b/testApp/remote/testMonitorPerformance.cpp @@ -434,7 +434,7 @@ int main (int argc, char *argv[]) } ClientFactory::start(); - provider = getChannelProviderRegistry()->getProvider("pva"); + provider = ChannelProviderRegistry::clients()->getProvider("pva"); if (!testFile.empty()) { diff --git a/testApp/remote/testRAII.cpp b/testApp/remote/testRAII.cpp index a22f253..842f055 100644 --- a/testApp/remote/testRAII.cpp +++ b/testApp/remote/testRAII.cpp @@ -93,7 +93,7 @@ int main() pva::ClientFactory::start(); pva::ChannelProvider::shared_pointer provider = - pva::getChannelProviderRegistry()->getProvider("pva"); + pva::ChannelProviderRegistry::clients()->getProvider("pva"); { diff --git a/testApp/remote/testRemoteClientImpl.cpp b/testApp/remote/testRemoteClientImpl.cpp index 4214de0..acb23e2 100644 --- a/testApp/remote/testRemoteClientImpl.cpp +++ b/testApp/remote/testRemoteClientImpl.cpp @@ -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);