From f4019432e69355c709c94b48e7f234a23b8ba5b9 Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Thu, 18 Feb 2016 09:53:46 +0000
Subject: [PATCH] Refs #15288 Change mutex for Load
---
Framework/DataHandling/inc/MantidDataHandling/Load.h | 3 +--
Framework/DataHandling/src/Load.cpp | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/Load.h b/Framework/DataHandling/inc/MantidDataHandling/Load.h
index 521d80f563f..87e15c05aa8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/Load.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/Load.h
@@ -5,7 +5,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
-#include <Poco/Mutex.h>
namespace Mantid {
namespace DataHandling {
@@ -112,7 +111,7 @@ private:
/// Filename
std::string m_filenamePropName;
/// Mutex for temporary fix for #5963
- static Poco::Mutex m_mutex;
+ static Mantid::Kernel::RecursiveMutex m_mutex;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/src/Load.cpp b/Framework/DataHandling/src/Load.cpp
index 2ebe08683fb..5e3b8e46137 100644
--- a/Framework/DataHandling/src/Load.cpp
+++ b/Framework/DataHandling/src/Load.cpp
@@ -88,7 +88,7 @@ namespace DataHandling {
DECLARE_ALGORITHM(Load)
// The mutex
-Poco::Mutex Load::m_mutex;
+Mantid::Kernel::RecursiveMutex Load::m_mutex;
using namespace Kernel;
using namespace API;
--
GitLab