diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
| commit | 78a6689aea1976d42ba0fca927f3e7572768e1fb (patch) | |
| tree | 5c16e6461f82c00ebef4906f748dba2dc360e80f /intern/cycles/device/device.h | |
| parent | 6c10ec74d5ec3d6fbbc1531463c117332b91ebed (diff) | |
| parent | ddabb21d0584e9874e8e5c62c04abe496ec7334b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index b09843e9f12..5d1308c3030 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -181,7 +181,7 @@ public: /* Convert the requested features structure to a build options, * which could then be passed to compilers. */ - string get_build_options(void) const + string get_build_options() const { string build_options = ""; if(experimental) { @@ -240,8 +240,8 @@ std::ostream& operator <<(std::ostream &os, /* Device */ struct DeviceDrawParams { - function<void(void)> bind_display_space_shader_cb; - function<void(void)> unbind_display_space_shader_cb; + function<void()> bind_display_space_shader_cb; + function<void()> unbind_display_space_shader_cb; }; class Device { @@ -374,4 +374,4 @@ private: CCL_NAMESPACE_END -#endif /* __DEVICE_H__ */ +#endif /* __DEVICE_H__ */ |