Commit: b663f1f1cf203337f165146d22814a4926499b23 Author: Sergey Sharybin Date: Mon Mar 30 15:17:09 2015 +0500 Branches: master https://developer.blender.org/rBb663f1f1cf203337f165146d22814a4926499b23
Cycles: Correction to previous commit: non-msvc compilers also should use nullptr =================================================================== M intern/cycles/util/util_function.h =================================================================== diff --git a/intern/cycles/util/util_function.h b/intern/cycles/util/util_function.h index 33e1593..6d0f0b4 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; _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
