1 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C
index 0c5a633e5..82e387152 100644
--- a/src/usr/cxxtest/cxxtestexec.C
+++ b/src/usr/cxxtest/cxxtestexec.C
@@ -67,7 +67,8 @@ void _start(void *io_pArgs)
     errlHndl_t  l_errl  =   NULL;
     std::vector<const char *> module_list;
     tid_t       tidrc           =   0;
-    TASKARGS_INIT_TASKARGS( io_pArgs );
+    INITSERVICE::TaskArgs *pTaskArgs =
+            static_cast<INITSERVICE::TaskArgs *>( io_pArgs );
 
 
     // output a blank line so that it's easier to find the beginning of
@@ -142,6 +143,7 @@ void _start(void *io_pArgs)
     //  dump out an informational errorlog
     assert(l_errl == NULL);
 
-
-    TASKARGS_WAIT_AND_ENDTASK();
+    //  wait here on the barrier, then end the task.
+    pTaskArgs->waitChildSync();
+    task_end();
 }