diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-11 17:50:10 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-11 17:51:14 +0300 |
commit | 92774ff792a6c474df2a40c13204da4975de0c09 (patch) | |
tree | 3c709f8f3126449bcc2c50ae51f89442d01e34d0 /intern/cycles/device | |
parent | d57f416e47f54241dea0892f3b064afbe1b8a899 (diff) |
Cycles: Use explicit qualifier for single-argument constructors
Almost in all cases we want such constructors to be explicit, there are
exceptions but only in few places.
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_multi.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_network.h | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_task.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 069305e8a29..6141f9af50f 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -35,7 +35,7 @@ class MultiDevice : public Device { public: struct SubDevice { - SubDevice(Device *device_) + explicit SubDevice(Device *device_) : device(device_) {} Device *device; diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 60ecc1d0a86..d28cfe3121f 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -322,7 +322,7 @@ protected: class ServerDiscovery { public: - ServerDiscovery(bool discover = false) + explicit ServerDiscovery(bool discover = false) : listen_socket(io_service), collect_servers(false) { /* setup listen socket */ diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index d7912f386f5..8423e83bdfd 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -51,7 +51,7 @@ public: int shader_filter; int shader_x, shader_w; - DeviceTask(Type type = PATH_TRACE); + explicit DeviceTask(Type type = PATH_TRACE); int get_subtask_count(int num, int max_size = 0); void split(list<DeviceTask>& tasks, int num, int max_size = 0); |