From 8523e605f28fa39f29ff2e37c2375e2ace64dc20 Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Fri, 25 Feb 2011 23:26:32 +0000
Subject: [PATCH] Refs #2555 : task mutex needs to be nulled.
---
Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp | 2 +-
Code/Mantid/Framework/Kernel/test/ThreadPoolTest.h | 2 +-
Code/Mantid/Framework/Kernel/test/ThreadSchedulerTest.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp b/Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp
index 64b0db718cd..0c41329627a 100644
--- a/Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp
+++ b/Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp
@@ -981,7 +981,7 @@ namespace DataObjects
public:
/// ctor
EventSortingTask(const EventWorkspace * WS, int wiStart, int wiStop, EventSortType sortType, size_t howManyCores, Mantid::API::Progress * prog)
- : m_wiStart(wiStart), m_wiStop(wiStop), m_sortType(sortType), m_howManyCores(howManyCores), m_WS(WS), prog(prog)
+ : Task(), m_wiStart(wiStart), m_wiStop(wiStop), m_sortType(sortType), m_howManyCores(howManyCores), m_WS(WS), prog(prog)
{
m_cost = 0;
if (m_wiStop > m_WS->getNumberHistograms())
diff --git a/Code/Mantid/Framework/Kernel/test/ThreadPoolTest.h b/Code/Mantid/Framework/Kernel/test/ThreadPoolTest.h
index facf6e55ae2..2a028f2f6e9 100644
--- a/Code/Mantid/Framework/Kernel/test/ThreadPoolTest.h
+++ b/Code/Mantid/Framework/Kernel/test/ThreadPoolTest.h
@@ -101,7 +101,7 @@ class TaskThatAddsTasks : public Task
public:
// ctor
TaskThatAddsTasks(ThreadScheduler * scheduler, size_t depth)
- : m_scheduler(scheduler), depth(depth)
+ : Task(), m_scheduler(scheduler), depth(depth)
{
// Use a randomized cost function; this will have an effect on the sorted schedulers.
m_cost = rand();
diff --git a/Code/Mantid/Framework/Kernel/test/ThreadSchedulerTest.h b/Code/Mantid/Framework/Kernel/test/ThreadSchedulerTest.h
index 91e5d2ebaab..b1c0cabc107 100644
--- a/Code/Mantid/Framework/Kernel/test/ThreadSchedulerTest.h
+++ b/Code/Mantid/Framework/Kernel/test/ThreadSchedulerTest.h
@@ -21,8 +21,8 @@ public:
class TaskDoNothing : public Task
{
public:
- TaskDoNothing() {}
- TaskDoNothing(double cost) {m_cost = cost;}
+ TaskDoNothing() : Task() {}
+ TaskDoNothing(double cost) : Task() {m_cost = cost;}
~TaskDoNothing()
{
--
GitLab