[Bf-blender-cvs] [7788681] master: MS Visual Studio 2015 does not find std::inserter
Martijn Berger
noreply at git.blender.org
Thu Jan 21 17:22:27 CET 2016
Commit: 7788681eda1f7329c83769b88821f0308a90f706
Author: Martijn Berger
Date: Thu Jan 21 17:21:32 2016 +0100
Branches: master
https://developer.blender.org/rB7788681eda1f7329c83769b88821f0308a90f706
MS Visual Studio 2015 does not find std::inserter
===================================================================
M intern/cycles/util/util_set.h
===================================================================
diff --git a/intern/cycles/util/util_set.h b/intern/cycles/util/util_set.h
index b3cb8dd..c568d60 100644
--- a/intern/cycles/util/util_set.h
+++ b/intern/cycles/util/util_set.h
@@ -23,6 +23,11 @@
#else
# include <boost/tr1/unordered_set.hpp>
#endif
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+# include <iterator>
+#endif
+
CCL_NAMESPACE_BEGIN
using std::set;
More information about the Bf-blender-cvs
mailing list