Make * to & changes due to changes in pvData.
This commit is contained in:
@@ -24,12 +24,12 @@ class ChannelAccessImpl : public ChannelAccess {
|
||||
public:
|
||||
|
||||
ChannelProvider* getProvider(String providerName) {
|
||||
Lock guard(&channelProviderMutex);
|
||||
Lock guard(channelProviderMutex);
|
||||
return channelProviders[providerName];
|
||||
}
|
||||
|
||||
std::vector<String>* getProviderNames() {
|
||||
Lock guard(&channelProviderMutex);
|
||||
Lock guard(channelProviderMutex);
|
||||
std::vector<String>* providers = new std::vector<String>();
|
||||
for (ChannelProviderMap::const_iterator i = channelProviders.begin();
|
||||
i != channelProviders.end(); i++)
|
||||
@@ -41,7 +41,7 @@ class ChannelAccessImpl : public ChannelAccess {
|
||||
|
||||
ChannelAccess * getChannelAccess() {
|
||||
static Mutex mutex = Mutex();
|
||||
Lock guard(&mutex);
|
||||
Lock guard(mutex);
|
||||
|
||||
if(channelAccess==0){
|
||||
channelAccess = new ChannelAccessImpl();
|
||||
@@ -50,12 +50,12 @@ ChannelAccess * getChannelAccess() {
|
||||
}
|
||||
|
||||
void registerChannelProvider(ChannelProvider *channelProvider) {
|
||||
Lock guard(&channelProviderMutex);
|
||||
Lock guard(channelProviderMutex);
|
||||
channelProviders[channelProvider->getProviderName()] = channelProvider;
|
||||
}
|
||||
|
||||
void unregisterChannelProvider(ChannelProvider *channelProvider) {
|
||||
Lock guard(&channelProviderMutex);
|
||||
Lock guard(channelProviderMutex);
|
||||
channelProviders.erase(channelProvider->getProviderName());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user