From b663f1f1cf203337f165146d22814a4926499b23 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 30 Mar 2015 15:17:09 +0500 Subject: Cycles: Correction to previous commit: non-msvc compilers also should use nullptr --- intern/cycles/util/util_function.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_function.h b/intern/cycles/util/util_function.h index 33e15939712..6d0f0b444a9 100644 --- a/intern/cycles/util/util_function.h +++ b/intern/cycles/util/util_function.h @@ -28,11 +28,7 @@ CCL_NAMESPACE_BEGIN #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) # define function_bind std::bind -# ifdef _MSC_VER -# define function_null nullptr -# else -# define function_null NULL -#endif +# define function_null nullptr using std::function; using std::placeholders::_1; using std::placeholders::_2; -- cgit v1.2.3