[Bf-blender-cvs] [5a169ae2f32] master: Cleanup: remove foreach include from header, conflicts with OpenVDB

[Brecht Van Lommel]

Commit: 5a169ae2f327f366137b6cefd2da75287f761a4f
Author: Brecht Van Lommel
Date:   Wed Mar 11 17:59:32 2020 +0100
Branches: master
https://developer.blender.org/rB5a169ae2f327f366137b6cefd2da75287f761a4f

Cleanup: remove foreach include from header, conflicts with OpenVDB

===================================================================

M	intern/cycles/blender/blender_device.cpp
M	intern/cycles/blender/blender_geometry.cpp
M	intern/cycles/bvh/bvh_optix.cpp
M	intern/cycles/util/util_profiling.cpp
M	intern/cycles/util/util_profiling.h

===================================================================

diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/blender_device.cpp
index d0f8465a98f..5140f190f36 100644
--- a/intern/cycles/blender/blender_device.cpp
+++ b/intern/cycles/blender/blender_device.cpp
@@ -17,6 +17,8 @@
 #include "blender/blender_device.h"
 #include "blender/blender_util.h"
 
+#include "util/util_foreach.h"
+
 CCL_NAMESPACE_BEGIN
 
 enum DenoiserType {
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp
index 304b3d18e27..e2a4a125ca1 100644
--- a/intern/cycles/blender/blender_geometry.cpp
+++ b/intern/cycles/blender/blender_geometry.cpp
@@ -23,6 +23,8 @@
 #include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
+#include "util/util_foreach.h"
+
 CCL_NAMESPACE_BEGIN
 
 Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp
index a3b6261dcad..da548e9c0db 100644
--- a/intern/cycles/bvh/bvh_optix.cpp
+++ b/intern/cycles/bvh/bvh_optix.cpp
@@ -22,6 +22,7 @@
 #  include "render/geometry.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
+#  include "util/util_foreach.h"
 #  include "util/util_logging.h"
 #  include "util/util_progress.h"
 
diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/util_profiling.cpp
index bbefbadd0fe..dc5bc35c48d 100644
--- a/intern/cycles/util/util_profiling.cpp
+++ b/intern/cycles/util/util_profiling.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "util/util_algorithm.h"
+#include "util/util_foreach.h"
 #include "util/util_profiling.h"
 #include "util/util_set.h"
 
diff --git a/intern/cycles/util/util_profiling.h b/intern/cycles/util/util_profiling.h
index f5f500239f2..ceec08ed894 100644
--- a/intern/cycles/util/util_profiling.h
+++ b/intern/cycles/util/util_profiling.h
@@ -19,7 +19,6 @@
 
 #include <atomic>
 
-#include "util/util_foreach.h"
 #include "util/util_map.h"
 #include "util/util_thread.h"
 #include "util/util_vector.h"