[Bf-blender-cvs] [b431a20] alembic: Revert "Avoid conflicting unordered_map definition in cycles"

[Lukas Tönne]

Commit: b431a209a888c276f386dbfd48d1fe83bc1b7baf
Author: Lukas Tönne
Date:   Tue Mar 24 11:03:38 2015 +0100
Branches: alembic
https://developer.blender.org/rBb431a209a888c276f386dbfd48d1fe83bc1b7baf

Revert "Avoid conflicting unordered_map definition in cycles"

This seems to break windows builds and should not be necessary.

This reverts commit 12384d564f59646145fa609dfe7e5a61632cd20f.

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

M	intern/cycles/util/util_map.h

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

diff --git a/intern/cycles/util/util_map.h b/intern/cycles/util/util_map.h
index 8084ede..54d6a8d 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 <tr1/unordered_map>
+#include <boost/tr1/unordered_map.hpp>
 
 CCL_NAMESPACE_BEGIN