diff --git a/include/CL/opencl.hpp b/include/CL/opencl.hpp index 3012b053..0817f32b 100644 --- a/include/CL/opencl.hpp +++ b/include/CL/opencl.hpp @@ -210,6 +210,11 @@ * * Enable the cl_khr_il_program extension. * + * - CL_HPP_WRAPPER_NS + * + * Allow qualifying the OpenCL library calls with a namespace. + * Normally when using function pointers to access the OpenCL library, + * e.g: when linking the OpenCL dynamic library with dlopen/dlsym. * * \section example Example * @@ -396,6 +401,10 @@ #ifndef CL_HPP_ #define CL_HPP_ +#ifndef CL_HPP_WRAPPER_NS +#define CL_HPP_WRAPPER_NS +#endif + /* Handle deprecated preprocessor definitions. In each case, we only check for * the old name if the new name is not defined, so that user code can define * both and hence work with either version of the bindings. @@ -1641,7 +1650,7 @@ struct GetInfoFunctor0 Func f_; const Arg0& arg0_; cl_int operator ()( cl_uint param, size_type size, void* value, size_type* size_ret) - { return f_(arg0_, param, size, value, size_ret); } + { return (*f_)(arg0_, param, size, value, size_ret); } }; template @@ -1650,7 +1659,7 @@ struct GetInfoFunctor1 Func f_; const Arg0& arg0_; const Arg1& arg1_; cl_int operator ()( cl_uint param, size_type size, void* value, size_type* size_ret) - { return f_(arg0_, arg1_, param, size, value, size_ret); } + { return (*f_)(arg0_, arg1_, param, size, value, size_ret); } }; template @@ -1691,7 +1700,7 @@ struct ReferenceHandler * CL_OUT_OF_HOST_MEMORY */ static cl_int retain(cl_device_id device) - { return ::clRetainDevice(device); } + { return CL_HPP_WRAPPER_NS::clRetainDevice(device); } /** * Retain the device. * \param device A valid device created using createSubDevices @@ -1702,7 +1711,7 @@ struct ReferenceHandler * CL_OUT_OF_HOST_MEMORY */ static cl_int release(cl_device_id device) - { return ::clReleaseDevice(device); } + { return CL_HPP_WRAPPER_NS::clReleaseDevice(device); } }; #else // CL_HPP_TARGET_OPENCL_VERSION >= 120 /** @@ -1735,63 +1744,63 @@ template <> struct ReferenceHandler { static cl_int retain(cl_context context) - { return ::clRetainContext(context); } + { return CL_HPP_WRAPPER_NS::clRetainContext(context); } static cl_int release(cl_context context) - { return ::clReleaseContext(context); } + { return CL_HPP_WRAPPER_NS::clReleaseContext(context); } }; template <> struct ReferenceHandler { static cl_int retain(cl_command_queue queue) - { return ::clRetainCommandQueue(queue); } + { return CL_HPP_WRAPPER_NS::clRetainCommandQueue(queue); } static cl_int release(cl_command_queue queue) - { return ::clReleaseCommandQueue(queue); } + { return CL_HPP_WRAPPER_NS::clReleaseCommandQueue(queue); } }; template <> struct ReferenceHandler { static cl_int retain(cl_mem memory) - { return ::clRetainMemObject(memory); } + { return CL_HPP_WRAPPER_NS::clRetainMemObject(memory); } static cl_int release(cl_mem memory) - { return ::clReleaseMemObject(memory); } + { return CL_HPP_WRAPPER_NS::clReleaseMemObject(memory); } }; template <> struct ReferenceHandler { static cl_int retain(cl_sampler sampler) - { return ::clRetainSampler(sampler); } + { return CL_HPP_WRAPPER_NS::clRetainSampler(sampler); } static cl_int release(cl_sampler sampler) - { return ::clReleaseSampler(sampler); } + { return CL_HPP_WRAPPER_NS::clReleaseSampler(sampler); } }; template <> struct ReferenceHandler { static cl_int retain(cl_program program) - { return ::clRetainProgram(program); } + { return CL_HPP_WRAPPER_NS::clRetainProgram(program); } static cl_int release(cl_program program) - { return ::clReleaseProgram(program); } + { return CL_HPP_WRAPPER_NS::clReleaseProgram(program); } }; template <> struct ReferenceHandler { static cl_int retain(cl_kernel kernel) - { return ::clRetainKernel(kernel); } + { return CL_HPP_WRAPPER_NS::clRetainKernel(kernel); } static cl_int release(cl_kernel kernel) - { return ::clReleaseKernel(kernel); } + { return CL_HPP_WRAPPER_NS::clReleaseKernel(kernel); } }; template <> struct ReferenceHandler { static cl_int retain(cl_event event) - { return ::clRetainEvent(event); } + { return CL_HPP_WRAPPER_NS::clRetainEvent(event); } static cl_int release(cl_event event) - { return ::clReleaseEvent(event); } + { return CL_HPP_WRAPPER_NS::clReleaseEvent(event); } }; @@ -2289,7 +2298,7 @@ class Device : public detail::Wrapper cl_int getInfo(cl_device_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetDeviceInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetDeviceInfo, object_, name, param), __GET_DEVICE_INFO_ERR); } @@ -2475,7 +2484,7 @@ class Platform : public detail::Wrapper // Otherwise set it cl_uint n = 0; - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = CL_HPP_WRAPPER_NS::clGetPlatformIDs(0, NULL, &n); if (err != CL_SUCCESS) { default_error_ = err; return; @@ -2486,7 +2495,7 @@ class Platform : public detail::Wrapper } vector ids(n); - err = ::clGetPlatformIDs(n, ids.data(), NULL); + err = CL_HPP_WRAPPER_NS::clGetPlatformIDs(n, ids.data(), NULL); if (err != CL_SUCCESS) { default_error_ = err; return; @@ -2576,7 +2585,7 @@ class Platform : public detail::Wrapper cl_int getInfo(cl_platform_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetPlatformInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetPlatformInfo, object_, name, param), __GET_PLATFORM_INFO_ERR); } @@ -2606,14 +2615,14 @@ class Platform : public detail::Wrapper if( devices == NULL ) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR); } - cl_int err = ::clGetDeviceIDs(object_, type, 0, NULL, &n); + cl_int err = CL_HPP_WRAPPER_NS::clGetDeviceIDs(object_, type, 0, NULL, &n); if (err != CL_SUCCESS && err != CL_DEVICE_NOT_FOUND) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); } vector ids(n); if (n>0) { - err = ::clGetDeviceIDs(object_, type, n, ids.data(), NULL); + err = CL_HPP_WRAPPER_NS::clGetDeviceIDs(object_, type, n, ids.data(), NULL); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); } @@ -2737,13 +2746,13 @@ class Platform : public detail::Wrapper return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_PLATFORM_IDS_ERR); } - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = CL_HPP_WRAPPER_NS::clGetPlatformIDs(0, NULL, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); } vector ids(n); - err = ::clGetPlatformIDs(n, ids.data(), NULL); + err = CL_HPP_WRAPPER_NS::clGetPlatformIDs(n, ids.data(), NULL); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); } @@ -2798,7 +2807,7 @@ class Platform : public detail::Wrapper cl_int unloadCompiler() { - return ::clUnloadPlatformCompiler(object_); + return CL_HPP_WRAPPER_NS::clUnloadPlatformCompiler(object_); } #endif // CL_HPP_TARGET_OPENCL_VERSION >= 120 }; // class Platform @@ -2821,7 +2830,7 @@ UnloadCompiler() CL_API_SUFFIX__VERSION_1_1_DEPRECATED; inline cl_int UnloadCompiler() { - return ::clUnloadCompiler(); + return CL_HPP_WRAPPER_NS::clUnloadCompiler(); } #endif // #if defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) @@ -2925,7 +2934,7 @@ class Context deviceIDs[deviceIndex] = (devices[deviceIndex])(); } - object_ = ::clCreateContext( + object_ = CL_HPP_WRAPPER_NS::clCreateContext( properties, (cl_uint) numDevices, deviceIDs.data(), notifyFptr, data, &error); @@ -2955,7 +2964,7 @@ class Context cl_device_id deviceID = device(); - object_ = ::clCreateContext( + object_ = CL_HPP_WRAPPER_NS::clCreateContext( properties, 1, &deviceID, notifyFptr, data, &error); @@ -3044,7 +3053,7 @@ class Context properties = &prop[0]; } #endif - object_ = ::clCreateContextFromType( + object_ = CL_HPP_WRAPPER_NS::clCreateContextFromType( properties, type, notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); @@ -3137,7 +3146,7 @@ class Context cl_int getInfo(cl_context_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetContextInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetContextInfo, object_, name, param), __GET_CONTEXT_INFO_ERR); } @@ -3170,7 +3179,7 @@ class Context return CL_SUCCESS; } - cl_int err = ::clGetSupportedImageFormats( + cl_int err = CL_HPP_WRAPPER_NS::clGetSupportedImageFormats( object_, flags, type, @@ -3183,7 +3192,7 @@ class Context if (numEntries > 0) { vector value(numEntries); - err = ::clGetSupportedImageFormats( + err = CL_HPP_WRAPPER_NS::clGetSupportedImageFormats( object_, flags, type, @@ -3279,7 +3288,7 @@ class Event : public detail::Wrapper cl_int getInfo(cl_event_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetEventInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetEventInfo, object_, name, param), __GET_EVENT_INFO_ERR); } @@ -3302,7 +3311,7 @@ class Event : public detail::Wrapper cl_int getProfilingInfo(cl_profiling_info name, T* param) const { return detail::errHandler(detail::getInfo( - &::clGetEventProfilingInfo, object_, name, param), + &CL_HPP_WRAPPER_NS::clGetEventProfilingInfo, object_, name, param), __GET_EVENT_PROFILE_INFO_ERR); } @@ -3327,7 +3336,7 @@ class Event : public detail::Wrapper cl_int wait() const { return detail::errHandler( - ::clWaitForEvents(1, &object_), + CL_HPP_WRAPPER_NS::clWaitForEvents(1, &object_), __WAIT_FOR_EVENTS_ERR); } @@ -3342,7 +3351,7 @@ class Event : public detail::Wrapper void * user_data = NULL) { return detail::errHandler( - ::clSetEventCallback( + CL_HPP_WRAPPER_NS::clSetEventCallback( object_, type, pfn_notify, @@ -3359,7 +3368,7 @@ class Event : public detail::Wrapper waitForEvents(const vector& events) { return detail::errHandler( - ::clWaitForEvents( + CL_HPP_WRAPPER_NS::clWaitForEvents( (cl_uint) events.size(), (events.size() > 0) ? (cl_event*)&events.front() : NULL), __WAIT_FOR_EVENTS_ERR); } @@ -3382,7 +3391,7 @@ class UserEvent : public Event cl_int * err = NULL) { cl_int error; - object_ = ::clCreateUserEvent( + object_ = CL_HPP_WRAPPER_NS::clCreateUserEvent( context(), &error); @@ -3402,7 +3411,7 @@ class UserEvent : public Event cl_int setStatus(cl_int status) { return detail::errHandler( - ::clSetUserEventStatus(object_,status), + CL_HPP_WRAPPER_NS::clSetUserEventStatus(object_,status), __SET_USER_EVENT_STATUS_ERR); } }; @@ -3416,7 +3425,7 @@ inline static cl_int WaitForEvents(const vector& events) { return detail::errHandler( - ::clWaitForEvents( + CL_HPP_WRAPPER_NS::clWaitForEvents( (cl_uint) events.size(), (events.size() > 0) ? (cl_event*)&events.front() : NULL), __WAIT_FOR_EVENTS_ERR); } @@ -3494,7 +3503,7 @@ class Memory : public detail::Wrapper cl_int getInfo(cl_mem_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetMemObjectInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetMemObjectInfo, object_, name, param), __GET_MEM_OBJECT_INFO_ERR); } @@ -3531,7 +3540,7 @@ class Memory : public detail::Wrapper void * user_data = NULL) { return detail::errHandler( - ::clSetMemObjectDestructorCallback( + CL_HPP_WRAPPER_NS::clSetMemObjectDestructorCallback( object_, pfn_notify, user_data), @@ -3938,7 +3947,7 @@ class Buffer : public Memory cl_int* err = NULL) { cl_int error; - object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); if (err != NULL) { @@ -3965,7 +3974,7 @@ class Buffer : public Memory Context context = Context::getDefault(err); - object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); if (err != NULL) { @@ -4005,9 +4014,9 @@ class Buffer : public Memory Context context = Context::getDefault(err); if( useHostPtr ) { - object_ = ::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); } else { - object_ = ::clCreateBuffer(context(), flags, size, 0, &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, 0, &error); } detail::errHandler(error, __CREATE_BUFFER_ERR); @@ -4105,7 +4114,7 @@ class Buffer : public Memory { Buffer result; cl_int error; - result.object_ = ::clCreateSubBuffer( + result.object_ = CL_HPP_WRAPPER_NS::clCreateSubBuffer( object_, flags, buffer_create_type, @@ -4254,7 +4263,7 @@ class BufferGL : public Buffer cl_int * err = NULL) { cl_int error; - object_ = ::clCreateFromGLBuffer( + object_ = CL_HPP_WRAPPER_NS::clCreateFromGLBuffer( context(), flags, bufobj, @@ -4323,7 +4332,7 @@ class BufferGL : public Buffer cl_GLuint * gl_object_name) { return detail::errHandler( - ::clGetGLObjectInfo(object_,type,gl_object_name), + CL_HPP_WRAPPER_NS::clGetGLObjectInfo(object_,type,gl_object_name), __GET_GL_OBJECT_INFO_ERR); } }; @@ -4351,7 +4360,7 @@ class BufferRenderGL : public Buffer cl_int * err = NULL) { cl_int error; - object_ = ::clCreateFromGLRenderbuffer( + object_ = CL_HPP_WRAPPER_NS::clCreateFromGLRenderbuffer( context(), flags, bufobj, @@ -4420,7 +4429,7 @@ class BufferRenderGL : public Buffer cl_GLuint * gl_object_name) { return detail::errHandler( - ::clGetGLObjectInfo(object_,type,gl_object_name), + CL_HPP_WRAPPER_NS::clGetGLObjectInfo(object_,type,gl_object_name), __GET_GL_OBJECT_INFO_ERR); } }; @@ -4492,7 +4501,7 @@ class Image : public Memory cl_int getImageInfo(cl_image_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetImageInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetImageInfo, object_, name, param), __GET_IMAGE_INFO_ERR); } @@ -4539,7 +4548,7 @@ class Image1D : public Image desc.image_type = CL_MEM_OBJECT_IMAGE1D; desc.image_width = width; - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -4627,7 +4636,7 @@ class Image1DBuffer : public Image desc.image_width = width; desc.buffer = buffer(); - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -4713,7 +4722,7 @@ class Image1DArray : public Image desc.image_array_size = arraySize; desc.image_row_pitch = rowPitch; - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -4825,7 +4834,7 @@ class Image2D : public Image desc.image_height = height; desc.image_row_pitch = row_pitch; - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -4842,7 +4851,7 @@ class Image2D : public Image #if CL_HPP_MINIMUM_OPENCL_VERSION < 120 if (!useCreateImage) { - object_ = ::clCreateImage2D( + object_ = CL_HPP_WRAPPER_NS::clCreateImage2D( context(), flags,&format, width, height, row_pitch, host_ptr, &error); detail::errHandler(error, __CREATE_IMAGE2D_ERR); @@ -4877,7 +4886,7 @@ class Image2D : public Image desc.image_row_pitch = row_pitch; desc.buffer = sourceBuffer(); - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), 0, // flags inherited from buffer &format, @@ -4940,7 +4949,7 @@ class Image2D : public Image desc.num_samples = sourceNumSamples; desc.buffer = sourceImage(); - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), 0, // flags should be inherited from mem_object &sourceFormat, @@ -5036,7 +5045,7 @@ class CL_API_PREFIX__VERSION_1_1_DEPRECATED Image2DGL : public Image2D cl_int * err = NULL) { cl_int error; - object_ = ::clCreateFromGLTexture2D( + object_ = CL_HPP_WRAPPER_NS::clCreateFromGLTexture2D( context(), flags, target, @@ -5134,7 +5143,7 @@ class Image2DArray : public Image desc.image_row_pitch = rowPitch; desc.image_slice_pitch = slicePitch; - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -5246,7 +5255,7 @@ class Image3D : public Image desc.image_row_pitch = row_pitch; desc.image_slice_pitch = slice_pitch; - object_ = ::clCreateImage( + object_ = CL_HPP_WRAPPER_NS::clCreateImage( context(), flags, &format, @@ -5263,7 +5272,7 @@ class Image3D : public Image #if CL_HPP_MINIMUM_OPENCL_VERSION < 120 if (!useCreateImage) { - object_ = ::clCreateImage3D( + object_ = CL_HPP_WRAPPER_NS::clCreateImage3D( context(), flags, &format, width, height, depth, row_pitch, slice_pitch, host_ptr, &error); @@ -5353,7 +5362,7 @@ class Image3DGL : public Image3D cl_int * err = NULL) { cl_int error; - object_ = ::clCreateFromGLTexture3D( + object_ = CL_HPP_WRAPPER_NS::clCreateFromGLTexture3D( context(), flags, target, @@ -5439,7 +5448,7 @@ class ImageGL : public Image cl_int * err = NULL) { cl_int error; - object_ = ::clCreateFromGLTexture( + object_ = CL_HPP_WRAPPER_NS::clCreateFromGLTexture( context(), flags, target, @@ -5532,7 +5541,7 @@ class Pipe : public Memory cl_int error; cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_HOST_NO_ACCESS; - object_ = ::clCreatePipe(context(), flags, packet_size, max_packets, nullptr, &error); + object_ = CL_HPP_WRAPPER_NS::clCreatePipe(context(), flags, packet_size, max_packets, nullptr, &error); detail::errHandler(error, __CREATE_PIPE_ERR); if (err != NULL) { @@ -5558,7 +5567,7 @@ class Pipe : public Memory Context context = Context::getDefault(err); cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_HOST_NO_ACCESS; - object_ = ::clCreatePipe(context(), flags, packet_size, max_packets, nullptr, &error); + object_ = CL_HPP_WRAPPER_NS::clCreatePipe(context(), flags, packet_size, max_packets, nullptr, &error); detail::errHandler(error, __CREATE_PIPE_ERR); if (err != NULL) { @@ -5622,7 +5631,7 @@ class Pipe : public Memory cl_int getInfo(cl_pipe_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetPipeInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetPipeInfo, object_, name, param), __GET_PIPE_INFO_ERR); } @@ -5676,7 +5685,7 @@ class Sampler : public detail::Wrapper CL_SAMPLER_ADDRESSING_MODE, addressing_mode, CL_SAMPLER_FILTER_MODE, filter_mode, 0 }; - object_ = ::clCreateSamplerWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateSamplerWithProperties( context(), sampler_properties, &error); @@ -5686,7 +5695,7 @@ class Sampler : public detail::Wrapper *err = error; } #else - object_ = ::clCreateSampler( + object_ = CL_HPP_WRAPPER_NS::clCreateSampler( context(), normalized_coords, addressing_mode, @@ -5755,7 +5764,7 @@ class Sampler : public detail::Wrapper cl_int getInfo(cl_sampler_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetSamplerInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetSamplerInfo, object_, name, param), __GET_SAMPLER_INFO_ERR); } @@ -5979,7 +5988,7 @@ class Kernel : public detail::Wrapper cl_int getInfo(cl_kernel_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetKernelInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetKernelInfo, object_, name, param), __GET_KERNEL_INFO_ERR); } @@ -6001,7 +6010,7 @@ class Kernel : public detail::Wrapper cl_int getArgInfo(cl_uint argIndex, cl_kernel_arg_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetKernelArgInfo, object_, argIndex, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetKernelArgInfo, object_, argIndex, name, param), __GET_KERNEL_ARG_INFO_ERR); } @@ -6025,7 +6034,7 @@ class Kernel : public detail::Wrapper { return detail::errHandler( detail::getInfo( - &::clGetKernelWorkGroupInfo, object_, device(), name, param), + &CL_HPP_WRAPPER_NS::clGetKernelWorkGroupInfo, object_, device(), name, param), __GET_KERNEL_WORK_GROUP_INFO_ERR); } @@ -6083,7 +6092,7 @@ class Kernel : public detail::Wrapper cl_int setArg(cl_uint index, const cl::pointer &argPtr) { return detail::errHandler( - ::clSetKernelArgSVMPointer(object_, index, argPtr.get()), + CL_HPP_WRAPPER_NS::clSetKernelArgSVMPointer(object_, index, argPtr.get()), __SET_KERNEL_ARGS_ERR); } @@ -6093,7 +6102,7 @@ class Kernel : public detail::Wrapper cl_int setArg(cl_uint index, const cl::vector &argPtr) { return detail::errHandler( - ::clSetKernelArgSVMPointer(object_, index, argPtr.data()), + CL_HPP_WRAPPER_NS::clSetKernelArgSVMPointer(object_, index, argPtr.data()), __SET_KERNEL_ARGS_ERR); } @@ -6104,7 +6113,7 @@ class Kernel : public detail::Wrapper setArg(cl_uint index, const T argPtr) { return detail::errHandler( - ::clSetKernelArgSVMPointer(object_, index, argPtr), + CL_HPP_WRAPPER_NS::clSetKernelArgSVMPointer(object_, index, argPtr), __SET_KERNEL_ARGS_ERR); } #endif // #if CL_HPP_TARGET_OPENCL_VERSION >= 200 @@ -6116,7 +6125,7 @@ class Kernel : public detail::Wrapper setArg(cl_uint index, const T &value) { return detail::errHandler( - ::clSetKernelArg( + CL_HPP_WRAPPER_NS::clSetKernelArg( object_, index, detail::KernelArgumentHandler::size(value), @@ -6127,7 +6136,7 @@ class Kernel : public detail::Wrapper cl_int setArg(cl_uint index, size_type size, const void* argPtr) { return detail::errHandler( - ::clSetKernelArg(object_, index, size, argPtr), + CL_HPP_WRAPPER_NS::clSetKernelArg(object_, index, size, argPtr), __SET_KERNEL_ARGS_ERR); } @@ -6139,7 +6148,7 @@ class Kernel : public detail::Wrapper cl_int setSVMPointers(const vector &pointerList) { return detail::errHandler( - ::clSetKernelExecInfo( + CL_HPP_WRAPPER_NS::clSetKernelExecInfo( object_, CL_KERNEL_EXEC_INFO_SVM_PTRS, sizeof(void*)*pointerList.size(), @@ -6154,7 +6163,7 @@ class Kernel : public detail::Wrapper cl_int setSVMPointers(const std::array &pointerList) { return detail::errHandler( - ::clSetKernelExecInfo( + CL_HPP_WRAPPER_NS::clSetKernelExecInfo( object_, CL_KERNEL_EXEC_INFO_SVM_PTRS, sizeof(void*)*pointerList.size(), @@ -6176,7 +6185,7 @@ class Kernel : public detail::Wrapper { cl_bool svmEnabled_ = svmEnabled ? CL_TRUE : CL_FALSE; return detail::errHandler( - ::clSetKernelExecInfo( + CL_HPP_WRAPPER_NS::clSetKernelExecInfo( object_, CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM, sizeof(cl_bool), @@ -6221,7 +6230,7 @@ class Kernel : public detail::Wrapper setSVMPointersHelper<0, 1 + sizeof...(Ts)>(pointerList, t0, ts...); return detail::errHandler( - ::clSetKernelExecInfo( + CL_HPP_WRAPPER_NS::clSetKernelExecInfo( object_, CL_KERNEL_EXEC_INFO_SVM_PTRS, sizeof(void*)*(1 + sizeof...(Ts)), @@ -6232,7 +6241,7 @@ class Kernel : public detail::Wrapper cl_int setExecInfo(cl_kernel_exec_info param_name, const T& val) { return detail::errHandler( - ::clSetKernelExecInfo( + CL_HPP_WRAPPER_NS::clSetKernelExecInfo( object_, param_name, sizeof(T), @@ -6289,14 +6298,14 @@ class Program : public detail::Wrapper Context context = Context::getDefault(err); - object_ = ::clCreateProgramWithSource( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithSource( context(), (cl_uint)1, &strings, &length, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); if (error == CL_SUCCESS && build) { - error = ::clBuildProgram( + error = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 0, NULL, @@ -6327,13 +6336,13 @@ class Program : public detail::Wrapper const char * strings = source.c_str(); const size_type length = source.size(); - object_ = ::clCreateProgramWithSource( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithSource( context(), (cl_uint)1, &strings, &length, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); if (error == CL_SUCCESS && build) { - error = ::clBuildProgram( + error = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 0, NULL, @@ -6379,7 +6388,7 @@ class Program : public detail::Wrapper #endif // #if !defined(CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY) } - object_ = ::clCreateProgramWithSource( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithSource( context(), (cl_uint)n, strings.data(), lengths.data(), &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); @@ -6414,7 +6423,7 @@ class Program : public detail::Wrapper #endif // #if !defined(CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY) } - object_ = ::clCreateProgramWithSource( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithSource( context(), (cl_uint)n, strings.data(), lengths.data(), &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); @@ -6440,7 +6449,7 @@ class Program : public detail::Wrapper #if CL_HPP_TARGET_OPENCL_VERSION >= 210 - object_ = ::clCreateProgramWithIL( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithIL( context(), static_cast(IL.data()), IL.size(), &error); #else // #if CL_HPP_TARGET_OPENCL_VERSION >= 210 @@ -6458,7 +6467,7 @@ class Program : public detail::Wrapper if (error == CL_SUCCESS && build) { - error = ::clBuildProgram( + error = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 0, NULL, @@ -6493,7 +6502,7 @@ class Program : public detail::Wrapper #if CL_HPP_TARGET_OPENCL_VERSION >= 210 - object_ = ::clCreateProgramWithIL( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithIL( context(), static_cast(IL.data()), IL.size(), &error); #else // #if CL_HPP_TARGET_OPENCL_VERSION >= 210 @@ -6510,7 +6519,7 @@ class Program : public detail::Wrapper detail::errHandler(error, __CREATE_PROGRAM_WITH_IL_ERR); if (error == CL_SUCCESS && build) { - error = ::clBuildProgram( + error = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 0, NULL, @@ -6595,7 +6604,7 @@ class Program : public detail::Wrapper binaryStatus->resize(numDevices); } - object_ = ::clCreateProgramWithBinary( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithBinary( context(), (cl_uint) devices.size(), deviceIDs.data(), lengths.data(), images.data(), (binaryStatus != NULL && numDevices > 0) @@ -6629,7 +6638,7 @@ class Program : public detail::Wrapper deviceIDs[deviceIndex] = (devices[deviceIndex])(); } - object_ = ::clCreateProgramWithBuiltInKernels( + object_ = CL_HPP_WRAPPER_NS::clCreateProgramWithBuiltInKernels( context(), (cl_uint) devices.size(), deviceIDs.data(), @@ -6702,7 +6711,7 @@ class Program : public detail::Wrapper deviceIDs[deviceIndex] = (devices[deviceIndex])(); } - cl_int buildError = ::clBuildProgram( + cl_int buildError = CL_HPP_WRAPPER_NS::clBuildProgram( object_, (cl_uint) devices.size(), @@ -6722,7 +6731,7 @@ class Program : public detail::Wrapper { cl_device_id deviceID = device(); - cl_int buildError = ::clBuildProgram( + cl_int buildError = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 1, &deviceID, @@ -6740,7 +6749,7 @@ class Program : public detail::Wrapper void (CL_CALLBACK * notifyFptr)(cl_program, void *) = NULL, void* data = NULL) const { - cl_int buildError = ::clBuildProgram( + cl_int buildError = CL_HPP_WRAPPER_NS::clBuildProgram( object_, 0, NULL, @@ -6757,7 +6766,7 @@ class Program : public detail::Wrapper void (CL_CALLBACK * notifyFptr)(cl_program, void *) = NULL, void* data = NULL) const { - cl_int error = ::clCompileProgram( + cl_int error = CL_HPP_WRAPPER_NS::clCompileProgram( object_, 0, NULL, @@ -6775,7 +6784,7 @@ class Program : public detail::Wrapper cl_int getInfo(cl_program_info name, T* param) const { return detail::errHandler( - detail::getInfo(&::clGetProgramInfo, object_, name, param), + detail::getInfo(&CL_HPP_WRAPPER_NS::clGetProgramInfo, object_, name, param), __GET_PROGRAM_INFO_ERR); } @@ -6798,7 +6807,7 @@ class Program : public detail::Wrapper { return detail::errHandler( detail::getInfo( - &::clGetProgramBuildInfo, object_, device(), name, param), + &CL_HPP_WRAPPER_NS::clGetProgramBuildInfo, object_, device(), name, param), __GET_PROGRAM_BUILD_INFO_ERR); } @@ -6862,14 +6871,14 @@ class Program : public detail::Wrapper cl_int createKernels(vector* kernels) { cl_uint numKernels; - cl_int err = ::clCreateKernelsInProgram(object_, 0, NULL, &numKernels); + cl_int err = CL_HPP_WRAPPER_NS::clCreateKernelsInProgram(object_, 0, NULL, &numKernels); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); } vector value(numKernels); - err = ::clCreateKernelsInProgram( + err = CL_HPP_WRAPPER_NS::clCreateKernelsInProgram( object_, numKernels, value.data(), NULL); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); @@ -6906,7 +6915,7 @@ class Program : public detail::Wrapper void * user_data = NULL) CL_API_SUFFIX__VERSION_2_2_DEPRECATED { return detail::errHandler( - ::clSetProgramReleaseCallback( + CL_HPP_WRAPPER_NS::clSetProgramReleaseCallback( object_, pfn_notify, user_data), @@ -6923,7 +6932,7 @@ class Program : public detail::Wrapper setSpecializationConstant(cl_uint index, const T &value) { return detail::errHandler( - ::clSetProgramSpecializationConstant( + CL_HPP_WRAPPER_NS::clSetProgramSpecializationConstant( object_, index, sizeof(value), @@ -6938,7 +6947,7 @@ class Program : public detail::Wrapper cl_int setSpecializationConstant(cl_uint index, size_type size, const void* value) { return detail::errHandler( - ::clSetProgramSpecializationConstant( + CL_HPP_WRAPPER_NS::clSetProgramSpecializationConstant( object_, index, size, @@ -6966,7 +6975,7 @@ inline Program linkProgram( detail::errHandler(error_local, __LINK_PROGRAM_ERR); } - cl_program prog = ::clLinkProgram( + cl_program prog = CL_HPP_WRAPPER_NS::clLinkProgram( ctx(), 0, NULL, @@ -7007,7 +7016,7 @@ inline Program linkProgram( detail::errHandler(error_local, __LINK_PROGRAM_ERR); } } - cl_program prog = ::clLinkProgram( + cl_program prog = CL_HPP_WRAPPER_NS::clLinkProgram( ctx(), 0, NULL, @@ -7048,7 +7057,7 @@ inline cl_int cl::Program::getInfo(cl_program_info name, vector cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, properties, 0 }; if ((properties & CL_QUEUE_ON_DEVICE) == 0) { - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); } else { @@ -7227,7 +7236,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7278,7 +7287,7 @@ class CommandQueue : public detail::Wrapper cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, static_cast(properties), 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -7289,7 +7298,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), device(), static_cast(properties), &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7343,7 +7352,7 @@ class CommandQueue : public detail::Wrapper cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, properties, 0 }; if ((properties & CL_QUEUE_ON_DEVICE) == 0) { - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), devices[0](), queue_properties, &error); } else { @@ -7358,7 +7367,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), devices[0](), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7409,7 +7418,7 @@ class CommandQueue : public detail::Wrapper if (useWithProperties) { cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, static_cast(properties), 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), devices[0](), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -7420,7 +7429,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), devices[0](), static_cast(properties), &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7460,7 +7469,7 @@ class CommandQueue : public detail::Wrapper if (useWithProperties) { cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, properties, 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -7471,7 +7480,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7511,7 +7520,7 @@ class CommandQueue : public detail::Wrapper if (useWithProperties) { cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, static_cast(properties), 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -7522,7 +7531,7 @@ class CommandQueue : public detail::Wrapper #endif // CL_HPP_TARGET_OPENCL_VERSION >= 200 #if CL_HPP_MINIMUM_OPENCL_VERSION < 200 if (!useWithProperties) { - object_ = ::clCreateCommandQueue( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueue( context(), device(), static_cast(properties), &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); @@ -7612,7 +7621,7 @@ class CommandQueue : public detail::Wrapper { return detail::errHandler( detail::getInfo( - &::clGetCommandQueueInfo, object_, name, param), + &CL_HPP_WRAPPER_NS::clGetCommandQueueInfo, object_, name, param), __GET_COMMAND_QUEUE_INFO_ERR); } @@ -7640,7 +7649,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueReadBuffer( + CL_HPP_WRAPPER_NS::clEnqueueReadBuffer( object_, buffer(), blocking, offset, size, ptr, (events != NULL) ? (cl_uint) events->size() : 0, @@ -7665,7 +7674,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueWriteBuffer( + CL_HPP_WRAPPER_NS::clEnqueueWriteBuffer( object_, buffer(), blocking, offset, size, ptr, (events != NULL) ? (cl_uint) events->size() : 0, @@ -7690,7 +7699,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueCopyBuffer( + CL_HPP_WRAPPER_NS::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, @@ -7719,7 +7728,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueReadBufferRect( + CL_HPP_WRAPPER_NS::clEnqueueReadBufferRect( object_, buffer(), blocking, @@ -7758,7 +7767,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueWriteBufferRect( + CL_HPP_WRAPPER_NS::clEnqueueWriteBufferRect( object_, buffer(), blocking, @@ -7796,7 +7805,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueCopyBufferRect( + CL_HPP_WRAPPER_NS::clEnqueueCopyBufferRect( object_, src(), dst(), @@ -7841,7 +7850,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueFillBuffer( + CL_HPP_WRAPPER_NS::clEnqueueFillBuffer( object_, buffer(), static_cast(&pattern), @@ -7873,7 +7882,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueReadImage( + CL_HPP_WRAPPER_NS::clEnqueueReadImage( object_, image(), blocking, @@ -7906,7 +7915,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueWriteImage( + CL_HPP_WRAPPER_NS::clEnqueueWriteImage( object_, image(), blocking, @@ -7937,7 +7946,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueCopyImage( + CL_HPP_WRAPPER_NS::clEnqueueCopyImage( object_, src(), dst(), @@ -7973,7 +7982,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueFillImage( + CL_HPP_WRAPPER_NS::clEnqueueFillImage( object_, image(), static_cast(&fillColor), @@ -8007,7 +8016,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueFillImage( + CL_HPP_WRAPPER_NS::clEnqueueFillImage( object_, image(), static_cast(&fillColor), @@ -8041,7 +8050,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueFillImage( + CL_HPP_WRAPPER_NS::clEnqueueFillImage( object_, image(), static_cast(&fillColor), @@ -8070,7 +8079,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueCopyImageToBuffer( + CL_HPP_WRAPPER_NS::clEnqueueCopyImageToBuffer( object_, src(), dst(), @@ -8099,7 +8108,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueCopyBufferToImage( + CL_HPP_WRAPPER_NS::clEnqueueCopyBufferToImage( object_, src(), dst(), @@ -8129,7 +8138,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int error; - void * result = ::clEnqueueMapBuffer( + void * result = CL_HPP_WRAPPER_NS::clEnqueueMapBuffer( object_, buffer(), blocking, flags, offset, size, (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -8160,7 +8169,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int error; - void * result = ::clEnqueueMapImage( + void * result = CL_HPP_WRAPPER_NS::clEnqueueMapImage( object_, buffer(), blocking, flags, origin.data(), region.data(), @@ -8270,7 +8279,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueUnmapMemObject( + CL_HPP_WRAPPER_NS::clEnqueueUnmapMemObject( object_, memory(), mapped_ptr, (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -8297,7 +8306,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueSVMUnmap( + CL_HPP_WRAPPER_NS::clEnqueueSVMUnmap( object_, static_cast(ptr), (events != NULL) ? (cl_uint)events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, @@ -8322,7 +8331,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueSVMUnmap( + CL_HPP_WRAPPER_NS::clEnqueueSVMUnmap( object_, static_cast(ptr.get()), (events != NULL) ? (cl_uint)events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, @@ -8347,7 +8356,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueSVMUnmap( + CL_HPP_WRAPPER_NS::clEnqueueSVMUnmap( object_, static_cast(container.data()), (events != NULL) ? (cl_uint)events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, @@ -8379,7 +8388,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueMarkerWithWaitList( + CL_HPP_WRAPPER_NS::clEnqueueMarkerWithWaitList( object_, (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -8409,7 +8418,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueBarrierWithWaitList( + CL_HPP_WRAPPER_NS::clEnqueueBarrierWithWaitList( object_, (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -8442,7 +8451,7 @@ class CommandQueue : public detail::Wrapper } cl_int err = detail::errHandler( - ::clEnqueueMigrateMemObjects( + CL_HPP_WRAPPER_NS::clEnqueueMigrateMemObjects( object_, (cl_uint)memObjects.size(), localMemObjects.data(), @@ -8591,7 +8600,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueNDRangeKernel( + CL_HPP_WRAPPER_NS::clEnqueueNDRangeKernel( object_, kernel(), (cl_uint) global.dimensions(), offset.dimensions() != 0 ? (const size_type*) offset : NULL, (const size_type*) global, @@ -8615,7 +8624,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueTask( + CL_HPP_WRAPPER_NS::clEnqueueTask( object_, kernel(), (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -8648,7 +8657,7 @@ class CommandQueue : public detail::Wrapper cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueNativeKernel( + CL_HPP_WRAPPER_NS::clEnqueueNativeKernel( object_, userFptr, args.first, args.second, (mem_objects != NULL) ? (cl_uint) mem_objects->size() : 0, mems.data(), @@ -8673,7 +8682,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueMarker( + CL_HPP_WRAPPER_NS::clEnqueueMarker( object_, (event != NULL) ? &tmp : NULL), __ENQUEUE_MARKER_ERR); @@ -8688,7 +8697,7 @@ class CommandQueue : public detail::Wrapper cl_int enqueueWaitForEvents(const vector& events) const CL_API_SUFFIX__VERSION_1_1_DEPRECATED { return detail::errHandler( - ::clEnqueueWaitForEvents( + CL_HPP_WRAPPER_NS::clEnqueueWaitForEvents( object_, (cl_uint) events.size(), events.size() > 0 ? (const cl_event*) &events.front() : NULL), @@ -8703,7 +8712,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueAcquireGLObjects( + CL_HPP_WRAPPER_NS::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, @@ -8725,7 +8734,7 @@ class CommandQueue : public detail::Wrapper { cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueReleaseGLObjects( + CL_HPP_WRAPPER_NS::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, @@ -8825,7 +8834,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *PFN_clEnqueueReleaseD3D10ObjectsKHR)( cl_int enqueueBarrier() const CL_API_SUFFIX__VERSION_1_1_DEPRECATED { return detail::errHandler( - ::clEnqueueBarrier(object_), + CL_HPP_WRAPPER_NS::clEnqueueBarrier(object_), __ENQUEUE_BARRIER_ERR); } #endif // CL_USE_DEPRECATED_OPENCL_1_1_APIS @@ -8884,7 +8893,7 @@ class DeviceCommandQueue : public detail::Wrapper cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, mergedProperties, 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -8908,7 +8917,7 @@ class DeviceCommandQueue : public detail::Wrapper CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE | CL_QUEUE_ON_DEVICE | static_cast(properties); cl_queue_properties queue_properties[] = { CL_QUEUE_PROPERTIES, mergedProperties, 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -8935,7 +8944,7 @@ class DeviceCommandQueue : public detail::Wrapper CL_QUEUE_PROPERTIES, mergedProperties, CL_QUEUE_SIZE, queueSize, 0 }; - object_ = ::clCreateCommandQueueWithProperties( + object_ = CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -8992,7 +9001,7 @@ class DeviceCommandQueue : public detail::Wrapper { return detail::errHandler( detail::getInfo( - &::clGetCommandQueueInfo, object_, name, param), + &CL_HPP_WRAPPER_NS::clGetCommandQueueInfo, object_, name, param), __GET_COMMAND_QUEUE_INFO_ERR); } @@ -9028,7 +9037,7 @@ class DeviceCommandQueue : public detail::Wrapper CL_QUEUE_PROPERTIES, properties, 0 }; DeviceCommandQueue deviceQueue( - ::clCreateCommandQueueWithProperties( + CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error)); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -9056,7 +9065,7 @@ class DeviceCommandQueue : public detail::Wrapper CL_QUEUE_PROPERTIES, properties, 0 }; DeviceCommandQueue deviceQueue( - ::clCreateCommandQueueWithProperties( + CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error)); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -9085,7 +9094,7 @@ class DeviceCommandQueue : public detail::Wrapper CL_QUEUE_SIZE, queueSize, 0 }; DeviceCommandQueue deviceQueue( - ::clCreateCommandQueueWithProperties( + CL_HPP_WRAPPER_NS::clCreateCommandQueueWithProperties( context(), device(), queue_properties, &error)); detail::errHandler(error, __CREATE_COMMAND_QUEUE_WITH_PROPERTIES_ERR); @@ -9168,9 +9177,9 @@ Buffer::Buffer( size_type size = sizeof(DataType)*(endIterator - startIterator); if( useHostPtr ) { - object_ = ::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); } else { - object_ = ::clCreateBuffer(context(), flags, size, 0, &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, 0, &error); } detail::errHandler(error, __CREATE_BUFFER_ERR); @@ -9221,10 +9230,10 @@ Buffer::Buffer( Context context = queue.getInfo(); if (useHostPtr) { - object_ = ::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); } else { - object_ = ::clCreateBuffer(context(), flags, size, 0, &error); + object_ = CL_HPP_WRAPPER_NS::clCreateBuffer(context(), flags, size, 0, &error); } detail::errHandler(error, __CREATE_BUFFER_ERR); @@ -9296,7 +9305,7 @@ inline void* enqueueMapBuffer( *err = error; } - void * result = ::clEnqueueMapBuffer( + void * result = CL_HPP_WRAPPER_NS::clEnqueueMapBuffer( queue(), buffer(), blocking, flags, offset, size, (events != NULL) ? (cl_uint) events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*) &events->front() : NULL, @@ -9400,7 +9409,7 @@ inline cl_int enqueueUnmapMemObject( cl_event tmp; cl_int err = detail::errHandler( - ::clEnqueueUnmapMemObject( + CL_HPP_WRAPPER_NS::clEnqueueUnmapMemObject( queue(), memory(), mapped_ptr, (events != NULL) ? (cl_uint)events->size() : 0, (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL,