diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-25 17:59:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 18:12:24 +0300 |
| commit | 885cc4cf9a1d5c167e4cbd26c3294d8b1ad400d8 (patch) | |
| tree | cb7f2b6ef98c6ce346f2378096bc9d32a3e5606e /intern/cycles/util/util_thread.h | |
| parent | b59d85b5a56c020c7b86b0cca4dc38e4950550f9 (diff) | |
Build: require C11/C++11 for all operating systems in master.
This is in preparation of upgrading our library dependencies, some of which
need C++11. We already use C++11 in blender2.8 and for Windows and macOS, so
this just affects Linux.
On many distributions this will not require any changes, on some
install_deps.sh will need to be run again to rebuild libraries.
Differential Revision: https://developer.blender.org/D3568
Diffstat (limited to 'intern/cycles/util/util_thread.h')
| -rw-r--r-- | intern/cycles/util/util_thread.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 77b51d37ea0..f39fcfb4279 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -17,15 +17,10 @@ #ifndef __UTIL_THREAD_H__ #define __UTIL_THREAD_H__ -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) -# include <thread> -# include <mutex> -# include <condition_variable> -# include <functional> -#else -# include <boost/thread.hpp> -# include <pthread.h> -#endif +#include <thread> +#include <mutex> +#include <condition_variable> +#include <functional> #include <queue> #ifdef _WIN32 @@ -42,16 +37,9 @@ CCL_NAMESPACE_BEGIN -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) typedef std::mutex thread_mutex; typedef std::unique_lock<std::mutex> thread_scoped_lock; typedef std::condition_variable thread_condition_variable; -#else -/* use boost for mutexes */ -typedef boost::mutex thread_mutex; -typedef boost::mutex::scoped_lock thread_scoped_lock; -typedef boost::condition_variable thread_condition_variable; -#endif /* own pthread based implementation, to avoid boost version conflicts with * dynamically loaded blender plugins */ @@ -66,11 +54,7 @@ public: protected: function<void(void)> run_cb_; -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) std::thread thread_; -#else - pthread_t pthread_id_; -#endif bool joined_; int group_; }; |