From 8c02a01bc617e99e1c6b7627676402bb276bac80 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 25 Feb 2015 14:09:38 +0100
Subject: Remove CAsyncAlgorithm::timedJoin
It is currently unused, and its current implementation is not very portable.
---
include/astra/AsyncAlgorithm.h | 4 ----
1 file changed, 4 deletions(-)
(limited to 'include/astra')
diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h
index 2d5d31e..36e2184 100644
--- a/include/astra/AsyncAlgorithm.h
+++ b/include/astra/AsyncAlgorithm.h
@@ -75,10 +75,6 @@ public:
*/
virtual void run(int _iNrIterations = 0);
- /** Wait for thread to complete and delete thread.
- */
- virtual void timedJoin(int _milliseconds);
-
/** Return pointer to the wrapped algorithm.
*/
CAlgorithm* getWrappedAlgorithm() { return m_pAlg; }
--
cgit v1.2.3
From 9a60acfc18e72b8aacdc7388617443e9854f4d3b Mon Sep 17 00:00:00 2001
From: Daan Pelt <daan.pelt@gmail.com>
Date: Wed, 25 Feb 2015 12:02:16 +0100
Subject: Moved pthreads defines to Globals.h
---
include/astra/AsyncAlgorithm.h | 4 +---
include/astra/Globals.h | 7 +++++++
2 files changed, 8 insertions(+), 3 deletions(-)
(limited to 'include/astra')
diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h
index 36e2184..a3157fc 100644
--- a/include/astra/AsyncAlgorithm.h
+++ b/include/astra/AsyncAlgorithm.h
@@ -32,14 +32,12 @@ $Id$
#include "Config.h"
#include "Algorithm.h"
-#ifdef __linux__
-#define USE_PTHREADS
+#ifdef USE_PTHREADS
#include <pthread.h>
#else
#include <boost/thread.hpp>
#endif
-
namespace astra {
/**
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index fdeaa23..9c8ddfb 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -306,4 +306,11 @@ _AstraExport inline bool cudaEnabled() { return false; }
#endif
+//----------------------------------------------------------------------------------------
+// use pthreads on Linux and OSX
+#if defined(__linux__) || defined(__MACH__)
+#define USE_PTHREADS
+#endif
+
+
#endif
--
cgit v1.2.3