From f01456aaa4a87cd76feaef50ec822340197f9eda Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Sun, 29 Mar 2015 22:12:22 +0200 Subject: Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though Reviewers: dingto, sergey Reviewed By: sergey Subscribers: #cycles Differential Revision: https://developer.blender.org/D1185 --- intern/cycles/util/util_foreach.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'intern/cycles/util/util_foreach.h') diff --git a/intern/cycles/util/util_foreach.h b/intern/cycles/util/util_foreach.h index 065bd33ebd2..4f7337107b3 100644 --- a/intern/cycles/util/util_foreach.h +++ b/intern/cycles/util/util_foreach.h @@ -19,8 +19,12 @@ /* Use Boost to get nice foreach() loops for STL data structures. */ -#include -#define foreach BOOST_FOREACH +#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) +# define foreach(x, y) for(x : y) +#else +# include +# define foreach BOOST_FOREACH +#endif #endif /* __UTIL_FOREACH_H__ */ -- cgit v1.2.3