sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: make it possible to include util_tbb.h in any order

Browse Source
This commit is contained in:
Brecht Van Lommel 2020-06-24 15:27:28 +02:00
parent 23b5e10dbd
commit 3cfb687b55
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/util/util_task.h
View File

@ -19,11 +19,10 @@
#include "util/util_list.h" #include "util/util_list.h"
#include "util/util_string.h" #include "util/util_string.h"
#include "util/util_tbb.h"
#include "util/util_thread.h" #include "util/util_thread.h"
#include "util/util_vector.h" #include "util/util_vector.h"
#include "util/util_tbb.h"
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
class TaskPool; class TaskPool;

4
intern/cycles/util/util_tbb.h
View File

@ -17,6 +17,10 @@
#ifndef __UTIL_TBB_H__ #ifndef __UTIL_TBB_H__
#define __UTIL_TBB_H__ #define __UTIL_TBB_H__
/* TBB includes <windows.h>, do it ourselves first so we are sure
* WIN32_LEAN_AND_MEAN and similar are defined beforehand. */
#include "util_windows.h"
#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 #define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
#include <tbb/tbb.h> #include <tbb/tbb.h>