From cc91e22038716c697933bdcf30e83f5281eb0332 Mon Sep 17 00:00:00 2001 From: Dave Hickin Date: Fri, 16 Sep 2016 21:22:33 +0100 Subject: [PATCH] testThread: Namespace qualify Thread Fixes build error with latest RTEMS (Thread ambiguous). --- testApp/misc/testThread.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testApp/misc/testThread.cpp b/testApp/misc/testThread.cpp index ab2d796..3e71520 100644 --- a/testApp/misc/testThread.cpp +++ b/testApp/misc/testThread.cpp @@ -54,7 +54,7 @@ static void testThreadRun() { // show that we can control thread start and stop ActionPtr ax(new Action()); { - ThreadPtr tr(new Thread(actionName,lowPriority,ax.get())); + epics::pvData::ThreadPtr tr(new epics::pvData::Thread(actionName,lowPriority,ax.get())); bool w=ax->begin.wait(); testDiag( "main %s", w?"true":"false"); testDiag( "Action is %s", ax->actuallyRan?"true":"false"); @@ -142,7 +142,7 @@ static void testBinders() { fninfo info; info.cnt = 0; - Thread foo(Thread::Config(&threadFN, (void*)&info) + epics::pvData::Thread foo(epics::pvData::Thread::Config(&threadFN, (void*)&info) .name("test1") .prio(epicsThreadPriorityMedium) .autostart(true) @@ -159,7 +159,7 @@ static void testBinders() { classMeth inst; - Thread foo(Thread::Config(&inst, &classMeth::inc) + epics::pvData::Thread foo(epics::pvData::Thread::Config(&inst, &classMeth::inc) .prio(epicsThreadPriorityMedium) .autostart(false) <<"test"<<2 @@ -182,7 +182,7 @@ static void testBinders() int cnt = 0; epicsEvent evnt; auto fn = [&cnt,&evnt]() mutable {evnt.signal(); cnt++;}; - Thread foo(Thread::Config(fn) + epics::pvData::Thread foo(epics::pvData::Thread::Config(fn) .name("test3") .prio(epicsThreadPriorityMedium) .autostart(true)