[khronos-opencl-headers] 02/03: Patch to fix symbol clash when cl2.hpp included from multiple files.

[James Price]

This is an automated email from the git hooks/post-receive script.

jprice-guest pushed a commit to branch master
in repository khronos-opencl-headers.

commit 7f7a5ce17da824ea8eff4b0b7d6230ac53b75de8
Author: James Price <j.price at bristol.ac.uk>
Date:   Sat Oct 24 01:28:29 2015 +0100

    Patch to fix symbol clash when cl2.hpp included from multiple files.
---
 debian/patches/fix_symbol_clash.patch | 23 +++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/fix_symbol_clash.patch b/debian/patches/fix_symbol_clash.patch
new file mode 100644
index 0000000..28896fd
--- /dev/null
+++ b/debian/patches/fix_symbol_clash.patch
@@ -0,0 +1,23 @@
+Description: Fix symbol clash when including cl2.hpp from multiple source files
+Author: James Price <j.price at bristol.ac.uk>
+Last-Update: 2015-10-24
+--- a/cl2.hpp
++++ b/cl2.hpp
+@@ -6557,7 +6557,7 @@
+     OutOfOrder = CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE,
+ };
+ 
+-QueueProperties operator|(QueueProperties lhs, QueueProperties rhs)
++inline QueueProperties operator|(QueueProperties lhs, QueueProperties rhs)
+ {
+     return static_cast<QueueProperties>(static_cast<cl_command_queue_properties>(lhs) | static_cast<cl_command_queue_properties>(rhs));
+ }
+@@ -8080,7 +8080,7 @@
+     Profiling = CL_QUEUE_PROFILING_ENABLE,
+ };
+ 
+-DeviceQueueProperties  operator|(DeviceQueueProperties  lhs, DeviceQueueProperties  rhs)
++inline DeviceQueueProperties operator|(DeviceQueueProperties lhs, DeviceQueueProperties rhs)
+ {
+     return static_cast<DeviceQueueProperties>(static_cast<cl_command_queue_properties>(lhs) | static_cast<cl_command_queue_properties>(rhs));
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 60a1758..6217d8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 AMD_extensions.patch
 use__vector.patch
+fix_symbol_clash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git