Differential D2586 Diff 8513 intern/cycles/util/util_thread.h

Changeset View

Standalone View

	Show All 26 Lines
	#endif			#endif
	#include <pthread.h>			#include <pthread.h>
	#include <queue>			#include <queue>

	#ifdef __APPLE__			#ifdef __APPLE__
	# include <libkern/OSAtomic.h>			# include <libkern/OSAtomic.h>
	#endif			#endif

	#include "util_function.h"			#include "util/util_function.h"

	CCL_NAMESPACE_BEGIN			CCL_NAMESPACE_BEGIN

	#if (__cplusplus > 199711L) \|\| (defined(_MSC_VER) && _MSC_VER >= 1800)			#if (__cplusplus > 199711L) \|\| (defined(_MSC_VER) && _MSC_VER >= 1800)
	typedef std::mutex thread_mutex;			typedef std::mutex thread_mutex;
	typedef std::unique_lock<std::mutex> thread_scoped_lock;			typedef std::unique_lock<std::mutex> thread_scoped_lock;
	typedef std::condition_variable thread_condition_variable;			typedef std::condition_variable thread_condition_variable;
	#else			#else
	▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines