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

work on porting

Browse Source
This commit is contained in:
Matej Sekoranja
2014-05-19 22:33:40 +02:00
parent 4f63aba281
commit 2ef0abc67b
5 changed files with 394 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pvAccessApp/factory/ChannelAccessFactory.cpp
View File

@@ -20,7 +20,7 @@ using namespace epics::pvData;
namespace epics {
namespace pvAccess {
static ChannelAccess::shared_pointer channelAccess;
static ChannelProviderRegistry::shared_pointer ChannelProviderRegistry;
static Mutex channelProviderMutex;
@@ -28,7 +28,7 @@ typedef std::map<String, ChannelProviderFactory::shared_pointer> ChannelProvider
static ChannelProviderFactoryMap channelProviders;
class ChannelAccessImpl : public ChannelAccess {
class ChannelProviderRegistryImpl : public ChannelProviderRegistry {
public:
ChannelProvider::shared_pointer getProvider(String const & _providerName) {
@@ -68,14 +68,14 @@ class ChannelAccessImpl : public ChannelAccess {
}
};
ChannelAccess::shared_pointer getChannelAccess() {
ChannelProviderRegistry::shared_pointer getChannelProviderRegistry() {
static Mutex mutex;
Lock guard(mutex);
if(channelAccess.get()==0){
channelAccess.reset(new ChannelAccessImpl());
if(ChannelProviderRegistry.get()==0){
ChannelProviderRegistry.reset(new ChannelProviderRegistryImpl());
}
return channelAccess;
return ChannelProviderRegistry;
}
void registerChannelProviderFactory(ChannelProviderFactory::shared_pointer const & channelProviderFactory) {