diff --git a/src/c_wrapper/clhelper.h b/src/c_wrapper/clhelper.h
index 312e7456128ad8d1c58df32c6ab2f110ee476e67..cec412df3670b4ed10225c88345ff34ca2ae823f 100644
--- a/src/c_wrapper/clhelper.h
+++ b/src/c_wrapper/clhelper.h
@@ -150,6 +150,36 @@ convert_obj(cl_int (*clRelease)(CLType), const char *name, CLType cl_obj,
#define pyopencl_convert_obj(type, func, args...) \
pyopencl::convert_obj<type>(func, #func, args)
+// {{{ extension function pointers
+
+#if PYOPENCL_CL_VERSION >= 0x1020
+template<typename T>
+PYOPENCL_USE_RESULT static PYOPENCL_INLINE T
+get_ext_fun(cl_platform_id plat, const char *name, const char *err)
+{
+ T func = (T)clGetExtensionFunctionAddressForPlatform(plat, name);
+ if (!func) {
+ throw pyopencl::clerror(name, CL_INVALID_VALUE, err);
+ }
+ return func;
+}
+#else
+template<typename T>
+PYOPENCL_USE_RESULT static PYOPENCL_INLINE T
+get_ext_fun(cl_platform_id, const char *name, const char *err)
+{
+ T func = (T)clGetExtensionFunctionAddress(name);
+ if (!func) {
+ throw pyopencl::clerror(name, CL_INVALID_VALUE, err);
+ }
+ return func;
+}
+#endif
+#define pyopencl_get_ext_fun(plat, name) \
+ pyopencl::get_ext_fun<name##_fn>(plat, #name, #name " not available")
+
+// }}}
+
}
#endif
diff --git a/src/c_wrapper/clobj.h b/src/c_wrapper/clobj.h
index 4e941d38e69165f752b82cc67723b194613f16c7..b0498b044940a658683f03f1c3752b4bf4356190 100644
--- a/src/c_wrapper/clobj.h
+++ b/src/c_wrapper/clobj.h
@@ -3,7 +3,7 @@
#ifndef __PYOPENCL_CLOBJ_H
#define __PYOPENCL_CLOBJ_H
-#define PYOPENCL_DEF_GET_CLASS_T(name) \
+#define PYOPENCL_DEF_CL_CLASS(name) \
static PYOPENCL_INLINE class_t \
get_class_t() \
{ \
@@ -58,7 +58,7 @@ public:
{
}
PYOPENCL_INLINE const typename CLObj::cl_type&
- convert()
+ convert() const
{
return m_obj.data();
}
@@ -76,7 +76,7 @@ public:
{
}
PYOPENCL_INLINE const typename CLObj::cl_type&
- convert()
+ convert() const
{
return m_obj->data();
}
diff --git a/src/c_wrapper/error.h b/src/c_wrapper/error.h
index 418c4696dac471c656cf4b15fed27d7a1d4ba5a9..b8004bf640fc802e8bf755c1afcecd091a25342c 100644
--- a/src/c_wrapper/error.h
+++ b/src/c_wrapper/error.h
@@ -152,7 +152,7 @@ call_guarded_cleanup(cl_int (*func)(ArgTypes...), const char *name,
pyopencl::call_guarded_cleanup(func, #func, args)
PYOPENCL_USE_RESULT static PYOPENCL_INLINE ::error*
-c_handle_error(std::function<void()> func)
+c_handle_error(std::function<void()> func) noexcept
{
try {
func();
diff --git a/src/c_wrapper/wrap_cl.cpp b/src/c_wrapper/wrap_cl.cpp
index aec8cb956acc44e1f8fc698ee59b874a11fb03b6..5aed9972c24b411f004570c41727f3ee172ccef9 100644
--- a/src/c_wrapper/wrap_cl.cpp
+++ b/src/c_wrapper/wrap_cl.cpp
@@ -4,36 +4,6 @@
#include <stdlib.h>
-// {{{ extension function pointers
-
-#if PYOPENCL_CL_VERSION >= 0x1020
-template<typename T>
-PYOPENCL_USE_RESULT static PYOPENCL_INLINE T
-pyopencl_get_ext_fun(cl_platform_id plat, const char *name, const char *err)
-{
- T func = (T)clGetExtensionFunctionAddressForPlatform(plat, name);
- if (!func) {
- throw pyopencl::clerror(name, CL_INVALID_VALUE, err);
- }
- return func;
-}
-#else
-template<typename T>
-PYOPENCL_USE_RESULT static PYOPENCL_INLINE T
-pyopencl_get_ext_fun(cl_platform_id, const char *name, const char *err)
-{
- T func = (T)clGetExtensionFunctionAddress(name);
- if (!func) {
- throw pyopencl::clerror(name, CL_INVALID_VALUE, err);
- }
- return func;
-}
-#endif
-#define pyopencl_get_ext_fun(plat, name) \
- pyopencl_get_ext_fun<name##_fn>(plat, #name, #name " not available")
-
-// }}}
-
namespace pyopencl {
// {{{ platform
@@ -41,7 +11,7 @@ namespace pyopencl {
class platform : public clobj<cl_platform_id> {
public:
using clobj::clobj;
- PYOPENCL_DEF_GET_CLASS_T(PLATFORM);
+ PYOPENCL_DEF_CL_CLASS(PLATFORM);
generic_info
get_info(cl_uint param_name) const
{
@@ -91,7 +61,7 @@ platform::get_devices(cl_device_type devtype) const
class device : public clobj<cl_device_id> {
public:
- PYOPENCL_DEF_GET_CLASS_T(DEVICE);
+ PYOPENCL_DEF_CL_CLASS(DEVICE);
enum reference_type_t {
REF_NOT_OWNABLE,
REF_FISSION_EXT,
@@ -455,7 +425,7 @@ public:
class context : public clobj<cl_context> {
public:
- PYOPENCL_DEF_GET_CLASS_T(CONTEXT);
+ PYOPENCL_DEF_CL_CLASS(CONTEXT);
context(cl_context ctx, bool retain)
: clobj(ctx)
{
@@ -576,7 +546,7 @@ private:
return pyopencl_call_guarded(clCreateCommandQueue, ctx, dev, props);
}
public:
- PYOPENCL_DEF_GET_CLASS_T(COMMAND_QUEUE);
+ PYOPENCL_DEF_CL_CLASS(COMMAND_QUEUE);
command_queue(cl_command_queue q, bool retain)
: clobj(q)
{
@@ -677,7 +647,7 @@ private:
};
#endif
public:
- PYOPENCL_DEF_GET_CLASS_T(EVENT);
+ PYOPENCL_DEF_CL_CLASS(EVENT);
event(cl_event event, bool retain)
: clobj(event)
{
@@ -975,7 +945,7 @@ class image : public memory_object {
private:
cl_image_format m_format;
public:
- PYOPENCL_DEF_GET_CLASS_T(IMAGE);
+ PYOPENCL_DEF_CL_CLASS(IMAGE);
image(cl_mem mem, bool retain, void *hostbuf=0,
const cl_image_format *fmt=0)
: memory_object(mem, retain, hostbuf)
@@ -1187,7 +1157,7 @@ get_apple_cgl_share_group()
class gl_buffer : public memory_object {
public:
- PYOPENCL_DEF_GET_CLASS_T(GL_BUFFER);
+ PYOPENCL_DEF_CL_CLASS(GL_BUFFER);
gl_buffer(cl_mem mem, bool retain, void *hostbuf=0)
: memory_object(mem, retain, hostbuf)
{}
@@ -1195,7 +1165,7 @@ public:
class gl_renderbuffer : public memory_object {
public:
- PYOPENCL_DEF_GET_CLASS_T(GL_RENDERBUFFER);
+ PYOPENCL_DEF_CL_CLASS(GL_RENDERBUFFER);
gl_renderbuffer(cl_mem mem, bool retain, void *hostbuf=0)
: memory_object(mem, retain, hostbuf)
{}
@@ -1373,7 +1343,7 @@ static PYOPENCL_INLINE buffer *new_buffer(cl_mem mem, void *buff=0);
class buffer : public memory_object {
public:
- PYOPENCL_DEF_GET_CLASS_T(BUFFER);
+ PYOPENCL_DEF_CL_CLASS(BUFFER);
buffer(cl_mem mem, bool retain, void *hostbuf=0)
: memory_object(mem, retain, hostbuf)
{}
@@ -1486,7 +1456,7 @@ public:
class sampler : public clobj<cl_sampler> {
public:
- PYOPENCL_DEF_GET_CLASS_T(SAMPLER);
+ PYOPENCL_DEF_CL_CLASS(SAMPLER);
sampler(const context *ctx, bool normalized_coordinates,
cl_addressing_mode am, cl_filter_mode fm)
: clobj(pyopencl_call_guarded(clCreateSampler, ctx,
@@ -1539,7 +1509,7 @@ private:
program_kind_type m_program_kind;
public:
- PYOPENCL_DEF_GET_CLASS_T(PROGRAM);
+ PYOPENCL_DEF_CL_CLASS(PROGRAM);
program(cl_program prog, bool retain,
program_kind_type progkind=KND_UNKNOWN)
: clobj(prog), m_program_kind(progkind)
@@ -1697,7 +1667,7 @@ new_program(cl_program prog, program_kind_type progkind=KND_UNKNOWN)
class kernel : public clobj<cl_kernel> {
public:
- PYOPENCL_DEF_GET_CLASS_T(KERNEL);
+ PYOPENCL_DEF_CL_CLASS(KERNEL);
kernel(cl_kernel knl, bool retain)
: clobj(knl)
{