sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Correction to previous commit: non-msvc compilers also should use nullptr

Browse Source
This commit is contained in:
Sergey Sharybin 2015-03-30 15:17:09 +05:00
parent 131912dc73
commit b663f1f1cf
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/util/util_function.h
View File

@ -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
using std::function;
using std::placeholders::_1;
using std::placeholders::_2;