diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-21 21:06:15 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-21 21:06:15 +0300 |
| commit | 4ce017b4c80ec883115f8fbb7ca400649d98d63f (patch) | |
| tree | cbf06438d69c1312b74871bcca4300f3e6324b36 | |
| parent | 6db876bef6325b81d598da0324fc48e71c52ba0f (diff) | |
Avoid conflicting unordered_map definition in cycles by using a general
include path instead of the boost one.
For explanation see http://stackoverflow.com/questions/3973659/c-unordered-map-compiling-issue-with-g
| -rw-r--r-- | intern/cycles/util/util_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_map.h b/intern/cycles/util/util_map.h index 54d6a8d6424..8084ede0784 100644 --- a/intern/cycles/util/util_map.h +++ b/intern/cycles/util/util_map.h @@ -18,7 +18,7 @@ #define __UTIL_MAP_H__ #include <map> -#include <boost/tr1/unordered_map.hpp> +#include <tr1/unordered_map> CCL_NAMESPACE_BEGIN |