rtems: reference to 'Configuration' is ambiguous

This commit is contained in:
Matej Sekoranja
2016-03-02 23:50:00 +01:00
parent 27a292d7f2
commit a27df1f8f4
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -34,13 +34,13 @@ public:
Lock guard(cfact_mutex);
if (!cfact_shared_provider)
{
Configuration::shared_pointer def;
epics::pvAccess::Configuration::shared_pointer def;
cfact_shared_provider = createClientProvider(def);
}
return cfact_shared_provider;
}
virtual ChannelProvider::shared_pointer newInstance(const std::tr1::shared_ptr<Configuration>& conf)
virtual ChannelProvider::shared_pointer newInstance(const std::tr1::shared_ptr<epics::pvAccess::Configuration>& conf)
{
Lock guard(cfact_mutex);
return createClientProvider(conf);