forked from bartvdbraak/blender
Cycles: Correction to previous commit: non-msvc compilers also should use nullptr
This commit is contained in:
parent
131912dc73
commit
b663f1f1cf
@ -28,11 +28,7 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
|
#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
|
||||||
# define function_bind std::bind
|
# define function_bind std::bind
|
||||||
# ifdef _MSC_VER
|
|
||||||
# define function_null nullptr
|
# define function_null nullptr
|
||||||
# else
|
|
||||||
# define function_null NULL
|
|
||||||
#endif
|
|
||||||
using std::function;
|
using std::function;
|
||||||
using std::placeholders::_1;
|
using std::placeholders::_1;
|
||||||
using std::placeholders::_2;
|
using std::placeholders::_2;
|
||||||
|
Loading…
Reference in New Issue
Block a user