[Bf-blender-cvs] [53c33cb] gooseberry: Gooseberry: Attempt to fix compilation error on OSX

[Sergey Sharybin]

Commit: 53c33cb7cbbc396ce3d9ff6345afb72bbb94035b
Author: Sergey Sharybin
Date:   Sun Jun 14 16:47:25 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB53c33cb7cbbc396ce3d9ff6345afb72bbb94035b

Gooseberry: Attempt to fix compilation error on OSX

There's in fact a conflict bewteeb math.h's isfinite and STL's one
which wasn't an issue previously because stl was not really included
into kernel for until openvdb work.

This commit only works issue around, proper solution is still needed.

P.S. It's still a good idea to not include headers which are unused
by current configuration anyway.

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

M	intern/cycles/util/util_openvdb.h

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

diff --git a/intern/cycles/util/util_openvdb.h b/intern/cycles/util/util_openvdb.h
index cb38211..e262ec9 100644
--- a/intern/cycles/util/util_openvdb.h
+++ b/intern/cycles/util/util_openvdb.h
@@ -1,7 +1,10 @@
 #ifndef __UTIL_OPENVDB_H__
 #define __UTIL_OPENVDB_H__
 
-#include "util_map.h"
+#ifdef WITH_OPENVDB
+#  include "util_map.h"
+#endif
+
 #include "util_types.h"
 
 #include "kernel_types.h"