diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:22 +0300 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:40 +0300 |
commit | f01456aaa4a87cd76feaef50ec822340197f9eda (patch) | |
tree | 5e4147b31def6462158b2ecd269df55ea1679c53 /intern/cycles/device | |
parent | 70d9c013257906d3e894907b92e693d1ccebd7fd (diff) |
Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though
Reviewers: dingto, sergey
Reviewed By: sergey
Subscribers: #cycles
Differential Revision: https://developer.blender.org/D1185
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device.h | 4 | ||||
-rw-r--r-- | intern/cycles/device/device_task.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 18fc707beab..7eb3f6c822b 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -72,8 +72,8 @@ public: /* Device */ struct DeviceDrawParams { - boost::function<void(void)> bind_display_space_shader_cb; - boost::function<void(void)> unbind_display_space_shader_cb; + function<void(void)> bind_display_space_shader_cb; + function<void(void)> unbind_display_space_shader_cb; }; class Device { diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index 84945bcf9a5..0c23d8971e0 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -57,11 +57,11 @@ public: void update_progress(RenderTile *rtile); - boost::function<bool(Device *device, RenderTile&)> acquire_tile; - boost::function<void(void)> update_progress_sample; - boost::function<void(RenderTile&)> update_tile_sample; - boost::function<void(RenderTile&)> release_tile; - boost::function<bool(void)> get_cancel; + function<bool(Device *device, RenderTile&)> acquire_tile; + function<void(void)> update_progress_sample; + function<void(RenderTile&)> update_tile_sample; + function<void(RenderTile&)> release_tile; + function<bool(void)> get_cancel; bool need_finish_queue; bool integrator_branched; |