Skip to content
Snippets Groups Projects
Commit f3ee7e63 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Fix Visual Studio 2015 (64-bit) (patch by Christoph Gohlke and Yuyi Chao)

parent 3b79b2c6
No related branches found
No related tags found
No related merge requests found
Pipeline #
#include <algorithm>
#include "buffer.h" #include "buffer.h"
#include "context.h" #include "context.h"
#include "command_queue.h" #include "command_queue.h"
......
...@@ -50,7 +50,7 @@ call_tuple(Function &&func, T &&args) ...@@ -50,7 +50,7 @@ call_tuple(Function &&func, T &&args)
} }
template<template<typename...> class Convert, typename... Types> template<template<typename...> class Convert, typename... Types>
using _ArgPackBase = std::tuple<Convert<rm_ref_t<Types> >...>; using _ArgPackBase = std::tuple<Convert<typename std::remove_reference<Types>::type>...>;
template<template<typename...> class Convert, typename... Types> template<template<typename...> class Convert, typename... Types>
class ArgPack : public _ArgPackBase<Convert, Types...> { class ArgPack : public _ArgPackBase<Convert, Types...> {
......
...@@ -60,9 +60,9 @@ enqueue_gl_objects(clEnqueueGLObjectFunc func, const char *name, ...@@ -60,9 +60,9 @@ enqueue_gl_objects(clEnqueueGLObjectFunc func, const char *name,
mem_objects, num_mem_objects); mem_objects, num_mem_objects);
call_guarded(func, name, cq, _mem_objs, _wait_for, event_out(evt)); call_guarded(func, name, cq, _mem_objs, _wait_for, event_out(evt));
} }
#define enqueue_gl_objects(what, args...) \ #define enqueue_gl_objects(what, ...) \
enqueue_gl_objects(clEnqueue##what##GLObjects, \ enqueue_gl_objects(clEnqueue##what##GLObjects, \
"clEnqueue" #what "GLObjects", args) "clEnqueue" #what "GLObjects", __VA_ARGS__)
// c wrapper // c wrapper
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <windows.h>
#define strdup _strdup #define strdup _strdup
#define strcasecmp _stricmp
#else #else
#include <unistd.h> #include <unistd.h>
#define PYOPENCL_HAVE_EVENT_SET_CALLBACK #define PYOPENCL_HAVE_EVENT_SET_CALLBACK
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment