diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
commit | dc13969e484ed9fa6834b1aba85ba00f65bf8a11 (patch) | |
tree | affc2efd3e5c8637fbfcaf0b3be87a78781876b9 /intern/cycles/device | |
parent | e86dbf687769a7f38ab465c89d1111a8be691ca2 (diff) |
Style cleanup: indentation, braces
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_network.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/device/device_network.h | 6 | ||||
-rw-r--r-- | intern/cycles/device/device_opencl.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 29b348d86ac..c667b8863d6 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -508,7 +508,7 @@ public: if(interpolation == INTERPOLATION_CLOSEST) { cuda_assert(cuTexRefSetFilterMode(texref, CU_TR_FILTER_MODE_POINT)); } - else if (interpolation == INTERPOLATION_LINEAR){ + else if (interpolation == INTERPOLATION_LINEAR) { cuda_assert(cuTexRefSetFilterMode(texref, CU_TR_FILTER_MODE_LINEAR)); } else {/* CUBIC and SMART are unsupported for CUDA */ diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp index 8f00324c3e1..af051076009 100644 --- a/intern/cycles/device/device_network.cpp +++ b/intern/cycles/device/device_network.cpp @@ -326,7 +326,7 @@ class DeviceServer { public: thread_mutex rpc_lock; - void network_error(const string &message){ + void network_error(const string &message) { error_func.network_error(message); } @@ -366,7 +366,7 @@ protected: { /* create a new DataVector and insert it into mem_data */ pair<DataMap::iterator,bool> data_ins = mem_data.insert( - DataMap::value_type(client_pointer, DataVector())); + DataMap::value_type(client_pointer, DataVector())); /* make sure it was a unique insertion */ assert(data_ins.second); diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 8596b61b179..893841d1da7 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -209,7 +209,7 @@ public: boost::system::error_code error; size_t len = boost::asio::read(socket, boost::asio::buffer(header), error); - if(error.value()){ + if(error.value()) { error_func->network_error(error.message()); } @@ -276,7 +276,7 @@ public: boost::system::error_code error; size_t len = boost::asio::read(socket, boost::asio::buffer(buffer, size), error); - if(error.value()){ + if(error.value()) { error_func->network_error(error.message()); } @@ -391,7 +391,7 @@ private: /* add address if it's not already in the list */ bool found = std::find(servers.begin(), servers.end(), - address) != servers.end(); + address) != servers.end(); if(!found) servers.push_back(address); diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 2e759d1a36f..694ec9db036 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -461,7 +461,7 @@ public: vector<cl_platform_id> platforms(num_platforms, NULL); ciErr = clGetPlatformIDs(num_platforms, &platforms[0], NULL); - if(opencl_error(ciErr)){ + if(opencl_error(ciErr)) { fprintf(stderr, "clGetPlatformIDs failed \n"); return; } @@ -489,7 +489,7 @@ public: /* get devices */ vector<cl_device_id> device_ids(num_devices, NULL); - if(opencl_error(clGetDeviceIDs(cpPlatform, opencl_device_type(), num_devices, &device_ids[0], NULL))){ + if(opencl_error(clGetDeviceIDs(cpPlatform, opencl_device_type(), num_devices, &device_ids[0], NULL))) { fprintf(stderr, "clGetDeviceIDs failed \n"); return; } @@ -528,7 +528,7 @@ public: cxContext = clCreateContext(context_props, 1, &cdDevice, context_notify_callback, cdDevice, &ciErr); - if(opencl_error(ciErr)){ + if(opencl_error(ciErr)) { opencl_error("OpenCL: clCreateContext failed"); return; } |