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

rtems: reference to 'Configuration' is ambiguous

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pva/clientFactory.cpp
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);

2
testApp/remote/channelAccessIFTest.cpp
View File

@@ -61,7 +61,7 @@ int ChannelAccessIFTest::runAllTest() {
testPlan(153+EXTRA_STRESS_TESTS);
Configuration::shared_pointer base_config(ConfigurationBuilder()
epics::pvAccess::Configuration::shared_pointer base_config(ConfigurationBuilder()
//.add("EPICS_PVA_DEBUG", "3")
.add("EPICS_PVAS_INTF_ADDR_LIST", "127.0.0.1")
.add("EPICS_PVA_ADDR_LIST", "127.0.0.1")

4
testApp/remote/testServer.cpp
View File

@@ -2735,13 +2735,13 @@ struct TestServer : public Runnable
static TestServer::shared_pointer ctx;
Configuration::shared_pointer conf;
epics::pvAccess::Configuration::shared_pointer conf;
ServerContextImpl::shared_pointer context;
Event startup;
Thread runner;
MockChannelProviderFactory::shared_pointer factory;
TestServer(const Configuration::shared_pointer& conf)
TestServer(const epics::pvAccess::Configuration::shared_pointer& conf)
:conf(conf)
,runner(Thread::Config(this).name("TestServer").autostart(false))
,factory(new MockChannelProviderFactory())