[Bf-blender-cvs] [12384d5] gooseberry: Avoid conflicting unordered_map definition in cycles by using a general include path instead of the boost one.

[Lukas Tönne]

Commit: 12384d564f59646145fa609dfe7e5a61632cd20f
Author: Lukas Tönne
Date:   Sat Mar 21 19:06:15 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB12384d564f59646145fa609dfe7e5a61632cd20f

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

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

M	intern/cycles/util/util_map.h

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

diff --git a/intern/cycles/util/util_map.h b/intern/cycles/util/util_map.h
index 54d6a8d..8084ede 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