diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:06:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:06:45 +0300 |
| commit | 131912dc73ddb828a9e393845e12f6d1c4f5d76b (patch) | |
| tree | f75b01cf8077f31de8f0138ed43c4a3e800d1613 /intern/cycles/util | |
| parent | 09397ac2c16efd073090f3c553568f4315273fa4 (diff) | |
Cycles: Fix compilation error with MSVC after recent C++11 changes
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_function.h | 6 | ||||
| -rw-r--r-- | intern/cycles/util/util_progress.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/intern/cycles/util/util_function.h b/intern/cycles/util/util_function.h index 83c07ae06a8..33e15939712 100644 --- a/intern/cycles/util/util_function.h +++ b/intern/cycles/util/util_function.h @@ -28,6 +28,11 @@ 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; @@ -41,6 +46,7 @@ using std::placeholders::_9; #else using boost::function; # define function_bind boost::bind +# define function_null NULL #endif CCL_NAMESPACE_END diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 963987487ed..13fce655734 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -44,12 +44,12 @@ public: substatus = ""; sync_status = ""; sync_substatus = ""; - update_cb = NULL; + update_cb = function_null; cancel = false; cancel_message = ""; error = false; error_message = ""; - cancel_cb = NULL; + cancel_cb = function_null; } Progress(Progress& progress) |