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

rtems: reference to 'Thread' is ambiguous

Browse Source
This commit is contained in:
Matej Sekoranja
2016-03-03 00:29:54 +01:00
parent a27df1f8f4
commit 9b6fdaaaff
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/remote/codec.cpp
View File

@@ -1040,11 +1040,11 @@ namespace epics {
std::tr1::shared_ptr<epics::pvData::ByteBuffer> const & sendBuffer,
int32_t socketSendBufferSize)
:AbstractCodec(serverFlag, receiveBuffer, sendBuffer, socketSendBufferSize, true)
,_readThread(Thread::Config(this, &BlockingAbstractCodec::receiveThread)
,_readThread(epics::pvData::Thread::Config(this, &BlockingAbstractCodec::receiveThread)
.prio(epicsThreadPriorityCAServerLow)
.name("TCP-rx")
.autostart(false))
,_sendThread(Thread::Config(this, &BlockingAbstractCodec::sendThread)
,_sendThread(epics::pvData::Thread::Config(this, &BlockingAbstractCodec::sendThread)
.prio(epicsThreadPriorityCAServerLow)
.name("TCP-tx")
.autostart(false))

2
testApp/remote/testCodec.cpp
View File

@@ -3186,7 +3186,7 @@ namespace epics {
ValueHolder valueHolder(codec);
Event done;
Thread thr(Thread::Config(&valueHolder)
epics::pvData::Thread thr(epics::pvData::Thread::Config(&valueHolder)
.name("testBlockingProcessQueueTest-processThread"));
valueHolder.waiter.wait();

4
testApp/remote/testServer.cpp
View File

@@ -2738,12 +2738,12 @@ struct TestServer : public Runnable
epics::pvAccess::Configuration::shared_pointer conf;
ServerContextImpl::shared_pointer context;
Event startup;
Thread runner;
epics::pvData::Thread runner;
MockChannelProviderFactory::shared_pointer factory;
TestServer(const epics::pvAccess::Configuration::shared_pointer& conf)
:conf(conf)
,runner(Thread::Config(this).name("TestServer").autostart(false))
,runner(epics::pvData::Thread::Config(this).name("TestServer").autostart(false))
,factory(new MockChannelProviderFactory())
{
registerChannelProviderFactory(factory);