diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-25 16:37:36 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-25 16:37:36 +0100 |
| commit | 214a5429db07e3e18af5856e164f850fbabca427 (patch) | |
| tree | b9c72b87a1ad931c11153462206afb0464c85d12 /include/astra | |
| parent | f619aba4543de6b9a4fe6fb63b6f1840ef509846 (diff) | |
| parent | 9a60acfc18e72b8aacdc7388617443e9854f4d3b (diff) | |
| download | astra-214a5429db07e3e18af5856e164f850fbabca427.tar.gz astra-214a5429db07e3e18af5856e164f850fbabca427.tar.bz2 astra-214a5429db07e3e18af5856e164f850fbabca427.tar.xz astra-214a5429db07e3e18af5856e164f850fbabca427.zip | |
Merge pull request #19 from wjp/osx-support
Improve support for OS X
Diffstat (limited to 'include/astra')
| -rw-r--r-- | include/astra/AsyncAlgorithm.h | 8 | ||||
| -rw-r--r-- | include/astra/Globals.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h index 2d5d31e..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 { /** @@ -75,10 +73,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; } 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 |