From e28062de879cc7863710e4cf4253693497eeef30 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 24 Jun 2019 19:25:51 +0200 Subject: [PATCH] Modernize OpenCL code --- .../pcps_opencl_acquisition_cc.cc | 4 +- src/algorithms/libs/opencl/cl.hpp | 1060 ++++++++--------- 2 files changed, 532 insertions(+), 532 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index beb3d74d1..1e8eef7c5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -209,7 +209,7 @@ int pcps_opencl_acquisition_cc::init_opencl_environment(const std::string &kerne std::vector all_platforms; cl::Platform::get(&all_platforms); - if (all_platforms.size() == 0) + if (all_platforms.empty()) { std::cout << "No OpenCL platforms found. Check OpenCL installation!" << std::endl; return 1; @@ -223,7 +223,7 @@ int pcps_opencl_acquisition_cc::init_opencl_environment(const std::string &kerne std::vector gpu_devices; d_cl_platform.getDevices(CL_DEVICE_TYPE_GPU, &gpu_devices); - if (gpu_devices.size() == 0) + if (gpu_devices.empty()) { std::cout << "No GPU devices found. Check OpenCL installation!" << std::endl; return 2; diff --git a/src/algorithms/libs/opencl/cl.hpp b/src/algorithms/libs/opencl/cl.hpp index 207cae751..b35f6e9cf 100644 --- a/src/algorithms/libs/opencl/cl.hpp +++ b/src/algorithms/libs/opencl/cl.hpp @@ -121,7 +121,7 @@ * cl::NullRange, * cl::NDRange(4,4), * cl::NullRange, - * NULL, + * nullptr, * &event); * * event.wait(); @@ -293,7 +293,7 @@ public: * handling of the exception has concluded. If set, it * will be returned by what(). */ - Error(cl_int err, const char* errStr = NULL) : err_(err), errStr_(errStr) + Error(cl_int err, const char* errStr = nullptr) : err_(err), errStr_(errStr) { } @@ -305,7 +305,7 @@ public: */ virtual const char* what() const throw() { - if (errStr_ == NULL) + if (errStr_ == nullptr) { return "empty"; } @@ -324,7 +324,7 @@ public: #define __ERR_STR(x) #x #else -#define __ERR_STR(x) NULL +#define __ERR_STR(x) nullptr #endif // __CL_ENABLE_EXCEPTIONS @@ -333,7 +333,7 @@ namespace detail #if defined(__CL_ENABLE_EXCEPTIONS) static inline cl_int errHandler( cl_int err, - const char* errStr = NULL) + const char* errStr = nullptr) { if (err != CL_SUCCESS) { @@ -342,7 +342,7 @@ static inline cl_int errHandler( return err; } #else -static inline cl_int errHandler(cl_int err, const char* errStr = NULL) +static inline cl_int errHandler(cl_int err, const char* errStr = nullptr) { (void)errStr; // suppress unused variable warning return err; @@ -498,7 +498,7 @@ private: public: //! \brief Constructs an empty string, allocating no memory. - string(void) : size_(0), str_(NULL) + string(void) : size_(0), str_(nullptr) { } @@ -508,18 +508,18 @@ public: * An extra '\0' is added, in case none was contained in str. * * \param str the initial value of the string instance. Note that '\0' - * characters receive no special treatment. If NULL, + * characters receive no special treatment. If nullptr, * the string is left empty, with a size of 0. * * \param size the number of characters to copy from str. */ string(const char* str, ::size_t size) : size_(size), - str_(NULL) + str_(nullptr) { if (size > 0) { str_ = new char[size_ + 1]; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, str, size_ * sizeof(char)); str_[size_] = '\0'; @@ -534,10 +534,10 @@ public: /*! \brief Constructs a string populated from a null-terminated value. * * \param str the null-terminated initial value of the string instance. - * If NULL, the string is left empty, with a size of 0. + * If nullptr, the string is left empty, with a size of 0. */ string(const char* str) : size_(0), - str_(NULL) + str_(nullptr) { if (str) { @@ -546,7 +546,7 @@ public: if (size_ > 0) { str_ = new char[size_ + 1]; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, str, (size_ + 1) * sizeof(char)); } @@ -565,7 +565,7 @@ public: { delete[] str_; } - str_ = NULL; + str_ = nullptr; size_ = 0; } else @@ -616,16 +616,16 @@ public: return *this; } - if (str_ != NULL) + if (str_ != nullptr) { delete[] str_; - str_ = NULL; + str_ = nullptr; size_ = 0; } - if (rhs.size_ == 0 || rhs.str_ == NULL) + if (rhs.size_ == 0 || rhs.str_ == nullptr) { - str_ = NULL; + str_ = nullptr; size_ = 0; } else @@ -633,7 +633,7 @@ public: str_ = new char[rhs.size_ + 1]; size_ = rhs.size_; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, rhs.str_, (size_ + 1) * sizeof(char)); } @@ -651,7 +651,7 @@ public: * \param rhs the string to copy. */ string(const string& rhs) : size_(0), - str_(NULL) + str_(nullptr) { *this = rhs; } @@ -660,7 +660,7 @@ public: ~string() { delete[] str_; - str_ = NULL; + str_ = nullptr; } //! \brief Queries the length of the string, excluding any added '\0's. @@ -969,7 +969,7 @@ public: public: iterator(void) : index_(-1), - vec_(NULL) + vec_(nullptr) { } @@ -1171,7 +1171,7 @@ namespace detail template inline cl_int getInfoHelper(Functor f, cl_uint name, T* param, long) { - return f(name, sizeof(T), param, NULL); + return f(name, sizeof(T), param, nullptr); } // Specialized getInfoHelper for VECTOR_CLASS params @@ -1179,14 +1179,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, long) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } T* value = (T*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1206,14 +1206,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, typename T::cl_type = 0) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } typename T::cl_type* value = (typename T::cl_type*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1223,7 +1223,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, t param->assign(&value[0], &value[elements]); for (::size_t i = 0; i < elements; i++) { - if (value[i] != NULL) + if (value[i] != nullptr) { err = (*param)[i].retain(); if (err != CL_SUCCESS) @@ -1239,7 +1239,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, t template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int) { - cl_int err = f(name, param->size() * sizeof(char*), &(*param)[0], NULL); + cl_int err = f(name, param->size() * sizeof(char*), &(*param)[0], nullptr); if (err != CL_SUCCESS) { @@ -1255,14 +1255,14 @@ inline cl_int getInfoHelper(Func f, cl_uint name, STRING_CLASS* param, long) { #if defined(__NO_STD_VECTOR) || defined(__NO_STD_STRING) ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } char* value = (char*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1272,7 +1272,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, STRING_CLASS* param, long) return CL_SUCCESS; #else ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; @@ -1281,7 +1281,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, STRING_CLASS* param, long) // std::string has a constant data member // a char vector does not VECTOR_CLASS value(required); - err = f(name, required, value.data(), NULL); + err = f(name, required, value.data(), nullptr); if (err != CL_SUCCESS) { return err; @@ -1299,14 +1299,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, size_t* param, long) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } ::size_t* value = (::size_t*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1333,13 +1333,13 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, T* param, int, typename T::cl_type = 0) { typename T::cl_type value; - cl_int err = f(name, sizeof(value), &value, NULL); + cl_int err = f(name, sizeof(value), &value, nullptr); if (err != CL_SUCCESS) { return err; } *param = value; - if (value != NULL) + if (value != nullptr) { err = param->retain(); if (err != CL_SUCCESS) @@ -1863,7 +1863,7 @@ static cl_uint getVersion(const char* versionInfo) static cl_uint getPlatformVersion(cl_platform_id platform) { ::size_t size = 0; - clGetPlatformInfo(platform, CL_PLATFORM_VERSION, 0, NULL, &size); + clGetPlatformInfo(platform, CL_PLATFORM_VERSION, 0, nullptr, &size); char* versionInfo = (char*)alloca(size); clGetPlatformInfo(platform, CL_PLATFORM_VERSION, size, &versionInfo[0], &size); return getVersion(versionInfo); @@ -1872,7 +1872,7 @@ static cl_uint getPlatformVersion(cl_platform_id platform) static cl_uint getDevicePlatformVersion(cl_device_id device) { cl_platform_id platform; - clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform), &platform, NULL); + clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform), &platform, nullptr); return getPlatformVersion(platform); } @@ -1882,11 +1882,11 @@ static cl_uint getContextPlatformVersion(cl_context context) // The platform cannot be queried directly, so we first have to grab a // device and obtain its context ::size_t size = 0; - clGetContextInfo(context, CL_CONTEXT_DEVICES, 0, NULL, &size); + clGetContextInfo(context, CL_CONTEXT_DEVICES, 0, nullptr, &size); if (size == 0) return 0; cl_device_id* devices = (cl_device_id*)alloca(size); - clGetContextInfo(context, CL_CONTEXT_DEVICES, size, devices, NULL); + clGetContextInfo(context, CL_CONTEXT_DEVICES, size, devices, nullptr); return getDevicePlatformVersion(devices[0]); } #endif // #if defined(CL_VERSION_1_2) && defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) @@ -1901,13 +1901,13 @@ protected: cl_type object_; public: - Wrapper() : object_(NULL) {} + Wrapper() : object_(nullptr) {} Wrapper(const cl_type& obj) : object_(obj) {} ~Wrapper() { - if (object_ != NULL) + if (object_ != nullptr) { release(); } @@ -1916,7 +1916,7 @@ public: Wrapper(const Wrapper& rhs) { object_ = rhs.object_; - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } @@ -1926,7 +1926,7 @@ public: Wrapper(Wrapper&& rhs) CL_HPP_NOEXCEPT { object_ = rhs.object_; - rhs.object_ = NULL; + rhs.object_ = nullptr; } #endif @@ -1934,12 +1934,12 @@ public: { if (this != &rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } object_ = rhs.object_; - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } @@ -1952,12 +1952,12 @@ public: { if (this != &rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } object_ = rhs.object_; - rhs.object_ = NULL; + rhs.object_ = nullptr; } return *this; } @@ -1965,7 +1965,7 @@ public: Wrapper& operator=(const cl_type& rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } @@ -2005,7 +2005,7 @@ protected: static bool isReferenceCountable(cl_device_id device) { bool retVal = false; - if (device != NULL) + if (device != nullptr) { int version = getDevicePlatformVersion(device); if (version > ((1 << 16) + 1)) @@ -2017,7 +2017,7 @@ protected: } public: - Wrapper() : object_(NULL), referenceCountable_(false) + Wrapper() : object_(nullptr), referenceCountable_(false) { } @@ -2028,7 +2028,7 @@ public: ~Wrapper() { - if (object_ != NULL) + if (object_ != nullptr) { release(); } @@ -2038,7 +2038,7 @@ public: { object_ = rhs.object_; referenceCountable_ = isReferenceCountable(object_); - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } @@ -2049,7 +2049,7 @@ public: { object_ = rhs.object_; referenceCountable_ = rhs.referenceCountable_; - rhs.object_ = NULL; + rhs.object_ = nullptr; rhs.referenceCountable_ = false; } #endif @@ -2058,13 +2058,13 @@ public: { if (this != &rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } object_ = rhs.object_; referenceCountable_ = rhs.referenceCountable_; - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } @@ -2077,13 +2077,13 @@ public: { if (this != &rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } object_ = rhs.object_; referenceCountable_ = rhs.referenceCountable_; - rhs.object_ = NULL; + rhs.object_ = nullptr; rhs.referenceCountable_ = false; } return *this; @@ -2092,7 +2092,7 @@ public: Wrapper& operator=(const cl_type& rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } @@ -2179,7 +2179,7 @@ struct ImageFormat : public cl_image_format class Device : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Device() : detail::Wrapper() {} /*! \brief Constructor from cl_device_id. @@ -2192,7 +2192,7 @@ public: * * \see Context::getDefault() */ - static Device getDefault(cl_int* err = NULL); + static Device getDefault(cl_int* err = nullptr); /*! \brief Assignment operator from cl_device_id. * @@ -2246,12 +2246,12 @@ public: //! \brief Wrapper for clGetDeviceInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_device_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2268,14 +2268,14 @@ public: VECTOR_CLASS* devices) { cl_uint n = 0; - cl_int err = clCreateSubDevices(object_, properties, 0, NULL, &n); + cl_int err = clCreateSubDevices(object_, properties, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = clCreateSubDevices(object_, properties, n, ids, NULL); + err = clCreateSubDevices(object_, properties, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); @@ -2302,18 +2302,18 @@ public: cl_device_id* /*out_devices*/, cl_uint* /*num_devices*/) CL_EXT_SUFFIX__VERSION_1_1; - static PFN_clCreateSubDevicesEXT pfn_clCreateSubDevicesEXT = NULL; + static PFN_clCreateSubDevicesEXT pfn_clCreateSubDevicesEXT = nullptr; __INIT_CL_EXT_FCN_PTR(clCreateSubDevicesEXT); cl_uint n = 0; - cl_int err = pfn_clCreateSubDevicesEXT(object_, properties, 0, NULL, &n); + cl_int err = pfn_clCreateSubDevicesEXT(object_, properties, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = pfn_clCreateSubDevicesEXT(object_, properties, n, ids, NULL); + err = pfn_clCreateSubDevicesEXT(object_, properties, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); @@ -2336,7 +2336,7 @@ public: class Platform : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Platform() : detail::Wrapper() {} /*! \brief Constructor from cl_platform_id. @@ -2366,12 +2366,12 @@ public: //! \brief Wrapper for clGetPlatformInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_platform_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2387,18 +2387,18 @@ public: VECTOR_CLASS* devices) const { cl_uint n = 0; - if (devices == NULL) + if (devices == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR); } - cl_int err = ::clGetDeviceIDs(object_, type, 0, NULL, &n); + cl_int err = ::clGetDeviceIDs(object_, type, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = ::clGetDeviceIDs(object_, type, n, ids, NULL); + err = ::clGetDeviceIDs(object_, type, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); @@ -2419,7 +2419,7 @@ public: * * \param devices returns a vector of OpenCL D3D10 devices found. The cl::Device * values returned in devices can be used to identify a specific OpenCL - * device. If \a devices argument is NULL, this argument is ignored. + * device. If \a devices argument is nullptr, this argument is ignored. * * \return One of the following values: * - CL_SUCCESS if the function is executed successfully. @@ -2447,12 +2447,12 @@ public: cl_device_id* devices, cl_uint* num_devices); - if (devices == NULL) + if (devices == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR); } - static PFN_clGetDeviceIDsFromD3D10KHR pfn_clGetDeviceIDsFromD3D10KHR = NULL; + static PFN_clGetDeviceIDsFromD3D10KHR pfn_clGetDeviceIDsFromD3D10KHR = nullptr; __INIT_CL_EXT_FCN_PTR_PLATFORM(object_, clGetDeviceIDsFromD3D10KHR); cl_uint n = 0; @@ -2462,7 +2462,7 @@ public: d3d_object, d3d_device_set, 0, - NULL, + nullptr, &n); if (err != CL_SUCCESS) { @@ -2477,7 +2477,7 @@ public: d3d_device_set, n, ids, - NULL); + nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); @@ -2497,12 +2497,12 @@ public: { cl_uint n = 0; - if (platforms == NULL) + if (platforms == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_PLATFORM_IDS_ERR); } - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2510,7 +2510,7 @@ public: cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2529,12 +2529,12 @@ public: { cl_uint n = 0; - if (platform == NULL) + if (platform == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_PLATFORM_IDS_ERR); } - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2542,7 +2542,7 @@ public: cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2557,15 +2557,15 @@ public: * Wraps clGetPlatformIDs(), returning the first result. */ static Platform get( - cl_int* errResult = NULL) + cl_int* errResult = nullptr) { Platform platform; cl_uint n = 0; - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { detail::errHandler(err, __GET_PLATFORM_IDS_ERR); - if (errResult != NULL) + if (errResult != nullptr) { *errResult = err; } @@ -2574,12 +2574,12 @@ public: cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { detail::errHandler(err, __GET_PLATFORM_IDS_ERR); - if (errResult != NULL) + if (errResult != nullptr) { *errResult = err; } @@ -2591,7 +2591,7 @@ public: } static Platform getDefault( - cl_int* errResult = NULL) + cl_int* errResult = nullptr) { return get(errResult); } @@ -2651,14 +2651,14 @@ public: */ Context( const VECTOR_CLASS& devices, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -2675,7 +2675,7 @@ public: notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2683,14 +2683,14 @@ public: Context( const Device& device, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -2702,7 +2702,7 @@ public: notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2714,21 +2714,21 @@ public: */ Context( cl_device_type type, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; #if !defined(__APPLE__) && !defined(__MACOS) cl_context_properties prop[4] = {CL_CONTEXT_PLATFORM, 0, 0, 0}; - if (properties == NULL) + if (properties == nullptr) { // Get a valid platform ID as we cannot send in a blank one VECTOR_CLASS platforms; @@ -2736,7 +2736,7 @@ public: if (error != CL_SUCCESS) { detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2769,7 +2769,7 @@ public: if (error != CL_SUCCESS && error != CL_DEVICE_NOT_FOUND) { detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2785,7 +2785,7 @@ public: if (platform_id == 0) { detail::errHandler(CL_DEVICE_NOT_FOUND, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = CL_DEVICE_NOT_FOUND; } @@ -2800,7 +2800,7 @@ public: properties, type, notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2840,7 +2840,7 @@ public: * * \note All calls to this function return the same cl_context as the first. */ - static Context getDefault(cl_int* err = NULL) + static Context getDefault(cl_int* err = nullptr) { int state = detail::compare_exchange( &default_initialized_, @@ -2848,7 +2848,7 @@ public: if (state & __DEFAULT_INITIALIZED) { - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -2863,7 +2863,7 @@ public: detail::fence(); } - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -2873,9 +2873,9 @@ public: cl_int error; default_ = Context( CL_DEVICE_TYPE_DEFAULT, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, &error); detail::fence(); @@ -2886,14 +2886,14 @@ public: detail::fence(); - if (err != NULL) + if (err != nullptr) { *err = default_error_; } return default_; } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Context() : detail::Wrapper() {} /*! \brief Constructor from cl_context - takes ownership. @@ -2926,12 +2926,12 @@ public: //! \brief Wrapper for clGetContextInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_context_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2959,7 +2959,7 @@ public: flags, type, 0, - NULL, + nullptr, &numEntries); if (err != CL_SUCCESS) { @@ -2976,7 +2976,7 @@ public: type, numEntries, (cl_image_format*)value, - NULL); + nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_SUPPORTED_IMAGE_FORMATS_ERR); @@ -3002,7 +3002,7 @@ inline Device Device::getDefault(cl_int* err) if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3010,7 +3010,7 @@ inline Device Device::getDefault(cl_int* err) else { device = context.getInfo()[0]; - if (err != NULL) + if (err != nullptr) { *err = CL_SUCCESS; } @@ -3049,7 +3049,7 @@ __attribute__((weak)) volatile cl_int Context::default_error_ = CL_SUCCESS; class Event : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Event() : detail::Wrapper() {} /*! \brief Constructor from cl_event - takes ownership. @@ -3082,12 +3082,12 @@ public: //! \brief Wrapper for clGetEventInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_event_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3106,12 +3106,12 @@ public: //! \brief Wrapper for clGetEventProfilingInfo() that returns by value. template typename detail::param_traits::param_type - getProfilingInfo(cl_int* err = NULL) const + getProfilingInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_profiling_info, name>::param_type param; cl_int result = getProfilingInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3137,7 +3137,7 @@ public: cl_int setCallback( cl_int type, void(CL_CALLBACK* pfn_notify)(cl_event, cl_int, void*), - void* user_data = NULL) + void* user_data = nullptr) { return detail::errHandler( ::clSetEventCallback( @@ -3158,7 +3158,7 @@ public: { return detail::errHandler( ::clWaitForEvents( - (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : NULL), + (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : nullptr), __WAIT_FOR_EVENTS_ERR); } }; @@ -3177,7 +3177,7 @@ public: */ UserEvent( const Context& context, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateUserEvent( @@ -3185,13 +3185,13 @@ public: &error); detail::errHandler(error, __CREATE_USER_EVENT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. UserEvent() : Event() {} /*! \brief Sets the execution status of a user event object. @@ -3216,7 +3216,7 @@ WaitForEvents(const VECTOR_CLASS& events) { return detail::errHandler( ::clWaitForEvents( - (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : NULL), + (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : nullptr), __WAIT_FOR_EVENTS_ERR); } @@ -3231,7 +3231,7 @@ WaitForEvents(const VECTOR_CLASS& events) class Memory : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Memory() : detail::Wrapper() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3294,12 +3294,12 @@ public: //! \brief Wrapper for clGetMemObjectInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_mem_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3322,7 +3322,7 @@ public: */ cl_int setDestructorCallback( void(CL_CALLBACK* pfn_notify)(cl_mem, void*), - void* user_data = NULL) + void* user_data = nullptr) { return detail::errHandler( ::clSetMemObjectDestructorCallback( @@ -3366,14 +3366,14 @@ public: const Context& context, cl_mem_flags flags, ::size_t size, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3391,8 +3391,8 @@ public: Buffer( cl_mem_flags flags, ::size_t size, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -3401,7 +3401,7 @@ public: object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3418,7 +3418,7 @@ public: IteratorType endIterator, bool readOnly, bool useHostPtr = false, - cl_int* err = NULL) + cl_int* err = nullptr) { typedef typename std::iterator_traits::value_type DataType; cl_int error; @@ -3451,7 +3451,7 @@ public: } detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3460,7 +3460,7 @@ public: { error = cl::copy(startIterator, endIterator, *this); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3474,7 +3474,7 @@ public: */ template Buffer(const Context& context, IteratorType startIterator, IteratorType endIterator, - bool readOnly, bool useHostPtr = false, cl_int* err = NULL); + bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); /*! * \brief Construct a Buffer from a host container via iterators using a specified queue. @@ -3482,9 +3482,9 @@ public: */ template Buffer(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator, - bool readOnly, bool useHostPtr = false, cl_int* err = NULL); + bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Buffer() : Memory() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3542,7 +3542,7 @@ public: cl_mem_flags flags, cl_buffer_create_type buffer_create_type, const void* buffer_create_info, - cl_int* err = NULL) + cl_int* err = nullptr) { Buffer result; cl_int error; @@ -3554,7 +3554,7 @@ public: &error); detail::errHandler(error, __CREATE_SUBBUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3589,9 +3589,9 @@ public: const Context& context, cl_mem_flags flags, ID3D10Buffer* bufobj, - cl_int* err = NULL) + cl_int* err = nullptr) { - static PFN_clCreateFromD3D10BufferKHR pfn_clCreateFromD3D10BufferKHR = NULL; + static PFN_clCreateFromD3D10BufferKHR pfn_clCreateFromD3D10BufferKHR = nullptr; #if defined(CL_VERSION_1_2) vector props = context.getInfo(); @@ -3617,13 +3617,13 @@ public: &error); detail::errHandler(error, __CREATE_GL_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. BufferD3D10() : Buffer() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3694,7 +3694,7 @@ public: const Context& context, cl_mem_flags flags, cl_GLuint bufobj, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLBuffer( @@ -3704,13 +3704,13 @@ public: &error); detail::errHandler(error, __CREATE_GL_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. BufferGL() : Buffer() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3779,7 +3779,7 @@ public: class Image : public Memory { protected: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image() : Memory() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3841,12 +3841,12 @@ public: //! \brief Wrapper for clGetImageInfo() that returns by value. template typename detail::param_traits::param_type - getImageInfo(cl_int* err = NULL) const + getImageInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_image_info, name>::param_type param; cl_int result = getImageInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3873,8 +3873,8 @@ public: cl_mem_flags flags, ImageFormat format, ::size_t width, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; cl_image_desc desc = @@ -3891,13 +3891,13 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image1D() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -3959,7 +3959,7 @@ public: ImageFormat format, ::size_t width, const Buffer& buffer, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; cl_image_desc desc = @@ -3973,11 +3973,11 @@ public: flags, &format, &desc, - NULL, + nullptr, &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4037,8 +4037,8 @@ public: ::size_t arraySize, ::size_t width, ::size_t rowPitch, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; cl_image_desc desc = @@ -4058,7 +4058,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4127,8 +4127,8 @@ public: ::size_t width, ::size_t height, ::size_t row_pitch = 0, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; bool useCreateImage; @@ -4165,7 +4165,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4178,7 +4178,7 @@ public: context(), flags, &format, width, height, row_pitch, host_ptr, &error); detail::errHandler(error, __CREATE_IMAGE2D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4186,7 +4186,7 @@ public: #endif // #if !defined(CL_VERSION_1_2) || defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image2D() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -4261,7 +4261,7 @@ public: cl_GLenum target, cl_GLint miplevel, cl_GLuint texobj, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture2D( @@ -4273,13 +4273,13 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_2D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image2DGL() : Image2D() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -4346,8 +4346,8 @@ public: ::size_t height, ::size_t rowPitch, ::size_t slicePitch, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; cl_image_desc desc = @@ -4369,7 +4369,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4439,8 +4439,8 @@ public: ::size_t depth, ::size_t row_pitch = 0, ::size_t slice_pitch = 0, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; bool useCreateImage; @@ -4479,7 +4479,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4493,7 +4493,7 @@ public: slice_pitch, host_ptr, &error); detail::errHandler(error, __CREATE_IMAGE3D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4501,7 +4501,7 @@ public: #endif // #if !defined(CL_VERSION_1_2) || defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image3D() : Image() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -4574,7 +4574,7 @@ public: cl_GLenum target, cl_GLint miplevel, cl_GLuint texobj, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture3D( @@ -4586,13 +4586,13 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_3D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image3DGL() : Image3D() {} /*! \brief Constructor from cl_mem - takes ownership. @@ -4659,7 +4659,7 @@ public: cl_GLenum target, cl_GLint miplevel, cl_GLuint texobj, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture( @@ -4671,7 +4671,7 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4744,7 +4744,7 @@ public: const Context& context, cl_mem_flags flags, cl_GLuint bufobj, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLRenderbuffer( @@ -4754,13 +4754,13 @@ public: &error); detail::errHandler(error, __CREATE_GL_RENDER_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. #if defined(CL_VERSION_1_2) BufferRenderGL() : ImageGL(){}; #else // #if defined(CL_VERSION_1_2) @@ -4875,7 +4875,7 @@ public: class Sampler : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Sampler() {} /*! \brief Constructs a Sampler in a specified context. @@ -4887,7 +4887,7 @@ public: cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateSampler( @@ -4898,7 +4898,7 @@ public: &error); detail::errHandler(error, __CREATE_SAMPLER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4964,12 +4964,12 @@ public: //! \brief Wrapper for clGetSamplerInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_sampler_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5054,7 +5054,7 @@ template <> struct KernelArgumentHandler { static ::size_t size(const LocalSpaceArg& value) { return value.size_; } - static const void* ptr(const LocalSpaceArg&) { return NULL; } + static const void* ptr(const LocalSpaceArg&) { return nullptr; } }; } // namespace detail @@ -5096,9 +5096,9 @@ Local(::size_t size) class Kernel : public detail::Wrapper { public: - inline Kernel(const Program& program, const char* name, cl_int* err = NULL); + inline Kernel(const Program& program, const char* name, cl_int* err = nullptr); - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Kernel() {} /*! \brief Constructor from cl_kernel - takes ownership. @@ -5159,12 +5159,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5182,12 +5182,12 @@ public: template typename detail::param_traits::param_type - getArgInfo(cl_uint argIndex, cl_int* err = NULL) const + getArgInfo(cl_uint argIndex, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_arg_info, name>::param_type param; cl_int result = getArgInfo(argIndex, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5207,12 +5207,12 @@ public: template typename detail::param_traits::param_type - getWorkGroupInfo(const Device& device, cl_int* err = NULL) const + getWorkGroupInfo(const Device& device, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_work_group_info, name>::param_type param; cl_int result = getWorkGroupInfo(device, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5251,7 +5251,7 @@ public: Program( const STRING_CLASS& source, bool build = false, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5270,15 +5270,15 @@ public: error = ::clBuildProgram( object_, 0, - NULL, + nullptr, "", - NULL, - NULL); + nullptr, + nullptr); detail::errHandler(error, __BUILD_PROGRAM_ERR); } - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5288,7 +5288,7 @@ public: const Context& context, const STRING_CLASS& source, bool build = false, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5305,15 +5305,15 @@ public: error = ::clBuildProgram( object_, 0, - NULL, + nullptr, "", - NULL, - NULL); + nullptr, + nullptr); detail::errHandler(error, __BUILD_PROGRAM_ERR); } - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5322,7 +5322,7 @@ public: Program( const Context& context, const Sources& sources, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5340,7 +5340,7 @@ public: context(), (cl_uint)n, strings, lengths, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5355,12 +5355,12 @@ public: * match the size of binaries and filled with values to specify if each binary * was successfully loaded. * Set to CL_SUCCESS if the binary was successfully loaded. - * Set to CL_INVALID_VALUE if the length is 0 or the binary pointer is NULL. + * Set to CL_INVALID_VALUE if the length is 0 or the binary pointer is nullptr. * Set to CL_INVALID_BINARY if the binary provided is not valid for the matching device. - * \param err if non-NULL will be set to CL_SUCCESS on successful operation or one of the following errors: + * \param err if non-nullptr will be set to CL_SUCCESS on successful operation or one of the following errors: * CL_INVALID_CONTEXT if context is not a valid context. * CL_INVALID_VALUE if the length of devices is zero; or if the length of binaries does not match the length of devices; - * or if any entry in binaries is NULL or has length 0. + * or if any entry in binaries is nullptr or has length 0. * CL_INVALID_DEVICE if OpenCL devices listed in devices are not in the list of devices associated with context. * CL_INVALID_BINARY if an invalid program binary was encountered for any device. binaryStatus will return specific status for each device. * CL_OUT_OF_HOST_MEMORY if there is a failure to allocate resources required by the OpenCL implementation on the host. @@ -5369,8 +5369,8 @@ public: const Context& context, const VECTOR_CLASS& devices, const Binaries& binaries, - VECTOR_CLASS* binaryStatus = NULL, - cl_int* err = NULL) + VECTOR_CLASS* binaryStatus = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -5381,7 +5381,7 @@ public: { error = CL_INVALID_VALUE; detail::errHandler(error, __CREATE_PROGRAM_WITH_BINARY_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5411,10 +5411,10 @@ public: object_ = ::clCreateProgramWithBinary( context(), (cl_uint)devices.size(), deviceIDs, - lengths, images, (binaryStatus != NULL && numDevices > 0) ? &binaryStatus->front() : NULL, &error); + lengths, images, (binaryStatus != nullptr && numDevices > 0) ? &binaryStatus->front() : nullptr, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_BINARY_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5430,7 +5430,7 @@ public: const Context& context, const VECTOR_CLASS& devices, const STRING_CLASS& kernelNames, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5450,7 +5450,7 @@ public: &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_BUILT_IN_KERNELS_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5501,9 +5501,9 @@ public: cl_int build( const VECTOR_CLASS& devices, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { ::size_t numDevices = devices.size(); cl_device_id* deviceIDs = (cl_device_id*)alloca(numDevices * sizeof(cl_device_id)); @@ -5525,15 +5525,15 @@ public: } cl_int build( - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { return detail::errHandler( ::clBuildProgram( object_, 0, - NULL, + nullptr, options, notifyFptr, data), @@ -5542,19 +5542,19 @@ public: #if defined(CL_VERSION_1_2) cl_int compile( - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { return detail::errHandler( ::clCompileProgram( object_, 0, - NULL, + nullptr, options, 0, - NULL, - NULL, + nullptr, + nullptr, notifyFptr, data), __COMPILE_PROGRAM_ERR); @@ -5571,12 +5571,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_program_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5595,12 +5595,12 @@ public: template typename detail::param_traits::param_type - getBuildInfo(const Device& device, cl_int* err = NULL) const + getBuildInfo(const Device& device, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_program_build_info, name>::param_type param; cl_int result = getBuildInfo(device, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5610,7 +5610,7 @@ public: cl_int createKernels(VECTOR_CLASS* kernels) { cl_uint numKernels; - cl_int err = ::clCreateKernelsInProgram(object_, 0, NULL, &numKernels); + cl_int err = ::clCreateKernelsInProgram(object_, 0, nullptr, &numKernels); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); @@ -5618,7 +5618,7 @@ public: Kernel* value = (Kernel*)alloca(numKernels * sizeof(Kernel)); err = ::clCreateKernelsInProgram( - object_, numKernels, (cl_kernel*)value, NULL); + object_, numKernels, (cl_kernel*)value, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); @@ -5633,10 +5633,10 @@ public: inline Program linkProgram( Program input1, Program input2, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error_local = CL_SUCCESS; @@ -5651,7 +5651,7 @@ inline Program linkProgram( cl_program prog = ::clLinkProgram( ctx(), 0, - NULL, + nullptr, options, 2, programs, @@ -5660,7 +5660,7 @@ inline Program linkProgram( &error_local); detail::errHandler(error_local, __COMPILE_PROGRAM_ERR); - if (err != NULL) + if (err != nullptr) { *err = error_local; } @@ -5670,16 +5670,16 @@ inline Program linkProgram( inline Program linkProgram( VECTOR_CLASS inputPrograms, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error_local = CL_SUCCESS; cl_program* programs = (cl_program*)alloca(inputPrograms.size() * sizeof(cl_program)); - if (programs != NULL) + if (programs != nullptr) { for (unsigned int i = 0; i < inputPrograms.size(); i++) { @@ -5699,7 +5699,7 @@ inline Program linkProgram( cl_program prog = ::clLinkProgram( ctx(), 0, - NULL, + nullptr, options, (cl_uint)inputPrograms.size(), programs, @@ -5708,7 +5708,7 @@ inline Program linkProgram( &error_local); detail::errHandler(error_local, __COMPILE_PROGRAM_ERR); - if (err != NULL) + if (err != nullptr) { *err = error_local; } @@ -5724,14 +5724,14 @@ inline VECTOR_CLASS cl::Program::getInfo(cl_int* err VECTOR_CLASS binaries; for (VECTOR_CLASS< ::size_t>::iterator s = sizes.begin(); s != sizes.end(); ++s) { - char* ptr = NULL; + char* ptr = nullptr; if (*s != 0) ptr = new char[*s]; binaries.push_back(ptr); } cl_int result = getInfo(CL_PROGRAM_BINARIES, &binaries); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5745,7 +5745,7 @@ inline Kernel::Kernel(const Program& program, const char* name, cl_int* err) object_ = ::clCreateKernel(program(), name, &error); detail::errHandler(error, __CREATE_KERNEL_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5768,7 +5768,7 @@ private: public: CommandQueue( cl_command_queue_properties properties, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5777,7 +5777,7 @@ public: if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5790,7 +5790,7 @@ public: context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5802,7 +5802,7 @@ public: explicit CommandQueue( const Context& context, cl_command_queue_properties properties = 0, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; VECTOR_CLASS devices; @@ -5812,7 +5812,7 @@ public: if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5823,7 +5823,7 @@ public: detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5833,14 +5833,14 @@ public: const Context& context, const Device& device, cl_command_queue_properties properties = 0, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateCommandQueue( context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5876,7 +5876,7 @@ public: } #endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) - static CommandQueue getDefault(cl_int* err = NULL) + static CommandQueue getDefault(cl_int* err = nullptr) { int state = detail::compare_exchange( &default_initialized_, @@ -5884,7 +5884,7 @@ public: if (state & __DEFAULT_INITIALIZED) { - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5899,7 +5899,7 @@ public: detail::fence(); } - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5913,7 +5913,7 @@ public: if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5925,7 +5925,7 @@ public: default_ = CommandQueue(context, device, 0, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5939,7 +5939,7 @@ public: detail::fence(); - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5967,12 +5967,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_command_queue_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5985,20 +5985,20 @@ public: ::size_t offset, ::size_t size, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReadBuffer( object_, buffer(), blocking, offset, size, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6010,20 +6010,20 @@ public: ::size_t offset, ::size_t size, const void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueWriteBuffer( object_, buffer(), blocking, offset, size, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6035,19 +6035,19 @@ public: ::size_t src_offset, ::size_t dst_offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyBuffer( object_, src(), dst(), src_offset, dst_offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQEUE_COPY_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6064,8 +6064,8 @@ public: ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6081,12 +6081,12 @@ public: host_row_pitch, host_slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6103,8 +6103,8 @@ public: ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6120,12 +6120,12 @@ public: host_row_pitch, host_slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6141,8 +6141,8 @@ public: ::size_t src_slice_pitch, ::size_t dst_row_pitch, ::size_t dst_slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6157,12 +6157,12 @@ public: src_slice_pitch, dst_row_pitch, dst_slice_pitch, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQEUE_COPY_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6181,8 +6181,8 @@ public: PatternType pattern, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6193,12 +6193,12 @@ public: sizeof(PatternType), offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6213,20 +6213,20 @@ public: ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReadImage( object_, image(), blocking, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6240,20 +6240,20 @@ public: ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueWriteImage( object_, image(), blocking, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6265,20 +6265,20 @@ public: const size_t<3>& src_origin, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyImage( object_, src(), dst(), (const ::size_t*)src_origin, (const ::size_t*)dst_origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6297,8 +6297,8 @@ public: cl_float4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6308,12 +6308,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6331,8 +6331,8 @@ public: cl_int4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6342,12 +6342,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6365,8 +6365,8 @@ public: cl_uint4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -6376,12 +6376,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6394,20 +6394,20 @@ public: const size_t<3>& src_origin, const size_t<3>& region, ::size_t dst_offset, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyImageToBuffer( object_, src(), dst(), (const ::size_t*)src_origin, (const ::size_t*)region, dst_offset, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_IMAGE_TO_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6419,20 +6419,20 @@ public: ::size_t src_offset, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyBufferToImage( object_, src(), dst(), src_offset, (const ::size_t*)dst_origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_BUFFER_TO_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6444,25 +6444,25 @@ public: cl_map_flags flags, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) const { cl_event tmp; cl_int error; void* result = ::clEnqueueMapBuffer( object_, buffer(), blocking, flags, offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr, &error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } - if (event != NULL && error == CL_SUCCESS) + if (event != nullptr && error == CL_SUCCESS) *event = tmp; return result; @@ -6476,9 +6476,9 @@ public: const size_t<3>& region, ::size_t* row_pitch, ::size_t* slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) const { cl_event tmp; cl_int error; @@ -6486,17 +6486,17 @@ public: object_, buffer(), blocking, flags, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr, &error); detail::errHandler(error, __ENQUEUE_MAP_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } - if (event != NULL && error == CL_SUCCESS) + if (event != nullptr && error == CL_SUCCESS) *event = tmp; return result; } @@ -6504,19 +6504,19 @@ public: cl_int enqueueUnmapMemObject( const Memory& memory, void* mapped_ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueUnmapMemObject( object_, memory(), mapped_ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6542,12 +6542,12 @@ public: cl_int err = detail::errHandler( ::clEnqueueMarkerWithWaitList( object_, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_MARKER_WAIT_LIST_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6572,12 +6572,12 @@ public: cl_int err = detail::errHandler( ::clEnqueueBarrierWithWaitList( object_, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_BARRIER_WAIT_LIST_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6590,8 +6590,8 @@ public: cl_int enqueueMigrateMemObjects( const VECTOR_CLASS& memObjects, cl_mem_migration_flags flags, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_event tmp; @@ -6608,12 +6608,12 @@ public: (cl_uint)memObjects.size(), static_cast(localMemObjects), flags, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6625,22 +6625,22 @@ public: const NDRange& offset, const NDRange& global, const NDRange& local = NullRange, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueNDRangeKernel( object_, kernel(), (cl_uint)global.dimensions(), - offset.dimensions() != 0 ? (const ::size_t*)offset : NULL, + offset.dimensions() != 0 ? (const ::size_t*)offset : nullptr, (const ::size_t*)global, - local.dimensions() != 0 ? (const ::size_t*)local : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + local.dimensions() != 0 ? (const ::size_t*)local : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_NDRANGE_KERNEL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6648,19 +6648,19 @@ public: cl_int enqueueTask( const Kernel& kernel, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueTask( object_, kernel(), - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_TASK_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6669,16 +6669,16 @@ public: cl_int enqueueNativeKernel( void(CL_CALLBACK* userFptr)(void*), std::pair args, - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* mem_locs = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* mem_locs = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - cl_mem* mems = (mem_objects != NULL && mem_objects->size() > 0) + cl_mem* mems = (mem_objects != nullptr && mem_objects->size() > 0) ? (cl_mem*)alloca(mem_objects->size() * sizeof(cl_mem)) - : NULL; + : nullptr; - if (mems != NULL) + if (mems != nullptr) { for (unsigned int i = 0; i < mem_objects->size(); i++) { @@ -6690,15 +6690,15 @@ public: cl_int err = detail::errHandler( ::clEnqueueNativeKernel( object_, userFptr, args.first, args.second, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, mems, - (mem_locs != NULL && mem_locs->size() > 0) ? (const void**)&mem_locs->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_locs != nullptr && mem_locs->size() > 0) ? (const void**)&mem_locs->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_NATIVE_KERNEL); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6709,16 +6709,16 @@ public: */ #if defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) || (defined(CL_VERSION_1_1) && !defined(CL_VERSION_1_2)) CL_EXT_PREFIX__VERSION_1_1_DEPRECATED - cl_int enqueueMarker(Event* event = NULL) const CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + cl_int enqueueMarker(Event* event = nullptr) const CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueMarker( object_, - (event != NULL) ? &tmp : NULL), + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_MARKER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6731,50 +6731,50 @@ public: ::clEnqueueWaitForEvents( object_, (cl_uint)events.size(), - events.size() > 0 ? (const cl_event*)&events.front() : NULL), + events.size() > 0 ? (const cl_event*)&events.front() : nullptr), __ENQUEUE_WAIT_FOR_EVENTS_ERR); } #endif // #if defined(CL_VERSION_1_1) cl_int enqueueAcquireGLObjects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueAcquireGLObjects( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_ACQUIRE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; } cl_int enqueueReleaseGLObjects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReleaseGLObjects( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_RELEASE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6791,11 +6791,11 @@ public: const cl_event* event_wait_list, cl_event* event); cl_int enqueueAcquireD3D10Objects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - static PFN_clEnqueueAcquireD3D10ObjectsKHR pfn_clEnqueueAcquireD3D10ObjectsKHR = NULL; + static PFN_clEnqueueAcquireD3D10ObjectsKHR pfn_clEnqueueAcquireD3D10ObjectsKHR = nullptr; #if defined(CL_VERSION_1_2) cl_context context = getInfo(); cl::Device device(getInfo()); @@ -6810,25 +6810,25 @@ public: cl_int err = detail::errHandler( pfn_clEnqueueAcquireD3D10ObjectsKHR( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_ACQUIRE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; } cl_int enqueueReleaseD3D10Objects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - static PFN_clEnqueueReleaseD3D10ObjectsKHR pfn_clEnqueueReleaseD3D10ObjectsKHR = NULL; + static PFN_clEnqueueReleaseD3D10ObjectsKHR pfn_clEnqueueReleaseD3D10ObjectsKHR = nullptr; #if defined(CL_VERSION_1_2) cl_context context = getInfo(); cl::Device device(getInfo()); @@ -6843,14 +6843,14 @@ public: cl_int err = detail::errHandler( pfn_clEnqueueReleaseD3D10ObjectsKHR( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_RELEASE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6937,7 +6937,7 @@ Buffer::Buffer( } detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -6946,14 +6946,14 @@ Buffer::Buffer( { CommandQueue queue(context, 0, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } error = cl::copy(queue, startIterator, endIterator, *this); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -7000,7 +7000,7 @@ Buffer::Buffer( } detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -7009,7 +7009,7 @@ Buffer::Buffer( { error = cl::copy(queue, startIterator, endIterator, *this); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -7022,8 +7022,8 @@ inline cl_int enqueueReadBuffer( ::size_t offset, ::size_t size, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7042,8 +7042,8 @@ inline cl_int enqueueWriteBuffer( ::size_t offset, ::size_t size, const void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7062,27 +7062,27 @@ inline void* enqueueMapBuffer( cl_map_flags flags, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } void* result = ::clEnqueueMapBuffer( queue(), buffer(), blocking, flags, offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, (cl_event*)event, &error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -7092,8 +7092,8 @@ inline void* enqueueMapBuffer( inline cl_int enqueueUnmapMemObject( const Memory& memory, void* mapped_ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7107,12 +7107,12 @@ inline cl_int enqueueUnmapMemObject( cl_int err = detail::errHandler( ::clEnqueueUnmapMemObject( queue(), memory(), mapped_ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -7124,8 +7124,8 @@ inline cl_int enqueueCopyBuffer( ::size_t src_offset, ::size_t dst_offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7256,8 +7256,8 @@ inline cl_int enqueueReadBufferRect( ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7293,8 +7293,8 @@ inline cl_int enqueueWriteBufferRect( ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7329,8 +7329,8 @@ inline cl_int enqueueCopyBufferRect( ::size_t src_slice_pitch, ::size_t dst_row_pitch, ::size_t dst_slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7363,8 +7363,8 @@ inline cl_int enqueueReadImage( ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7394,8 +7394,8 @@ inline cl_int enqueueWriteImage( ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7423,8 +7423,8 @@ inline cl_int enqueueCopyImage( const size_t<3>& src_origin, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7450,8 +7450,8 @@ inline cl_int enqueueCopyImageToBuffer( const size_t<3>& src_origin, const size_t<3>& region, ::size_t dst_offset, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7477,8 +7477,8 @@ inline cl_int enqueueCopyBufferToImage( ::size_t src_offset, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7724,7 +7724,7 @@ public: KernelFunctorGlobal( const Program& program, const STRING_CLASS name, - cl_int* err = NULL) : kernel_(program, name.c_str(), err) + cl_int* err = nullptr) : kernel_(program, name.c_str(), err) { } @@ -12948,15 +12948,15 @@ public: make_kernel( const Program& program, const STRING_CLASS name, - cl_int* err = NULL) : detail::functionImplementation_( - FunctorType(program, name, err)) + cl_int* err = nullptr) : detail::functionImplementation_( + FunctorType(program, name, err)) { }