diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:17:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:17:09 +0300 |
| commit | b663f1f1cf203337f165146d22814a4926499b23 (patch) | |
| tree | 4e8c6f35491a5b9a360acaba5f6fa2b5ee0da666 /intern/cycles/util | |
| parent | 131912dc73ddb828a9e393845e12f6d1c4f5d76b (diff) | |
Cycles: Correction to previous commit: non-msvc compilers also should use nullptr
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_function.h | 6 |
1 files changed, 1 insertions, 5 deletions
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; |