From e804f444976c06bc2b1c8eb84c23a17a9ec65d06 Mon Sep 17 00:00:00 2001
From: Tom Deakin <tom.deakin@bristol.ac.uk>
Date: Mon, 10 Aug 2015 11:23:11 +0100
Subject: [PATCH] Update OpenCL code to use new C++ header calls

Specifically:
 * make_kernel has been replaced by KernelFunctor.
 * Different define statements before including the header.
---
 ocl-stream.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ocl-stream.cpp b/ocl-stream.cpp
index caa1a11..819ec9d 100644
--- a/ocl-stream.cpp
+++ b/ocl-stream.cpp
@@ -42,8 +42,10 @@
 #include <cfloat>
 #include <cmath>
 
-#define __CL_ENABLE_EXCEPTIONS
-#include "CL/cl.hpp"
+#define CL_HPP_ENABLE_EXCEPTIONS
+#define CL_HPP_MINIMUM_OPENCL_VERSION 110
+#define CL_HPP_TARGET_OPENCL_VERSION 110
+#include "CL/cl2.hpp"
 #include "common.h"
 
 std::string getDeviceName(const cl::Device& device);
@@ -193,13 +195,13 @@ int main(int argc, char *argv[])
         }
 
         status = "Making kernel copy";
-        cl::make_kernel<cl::Buffer&, cl::Buffer&> copy(program, "copy");
+        auto copy = cl::KernelFunctor<cl::Buffer&, cl::Buffer&>(program, "copy");
         status = "Making kernel mul";
-        cl::make_kernel<cl::Buffer&, cl::Buffer&> mul(program, "mul");
+        auto mul = cl::KernelFunctor<cl::Buffer&, cl::Buffer&>(program, "mul");
         status = "Making kernel add";
-        cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&> add(program, "add");
+        auto add = cl::KernelFunctor<cl::Buffer&, cl::Buffer&, cl::Buffer&>(program, "add");
         status = "Making kernel triad";
-        cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&> triad(program, "triad");
+        auto triad = cl::KernelFunctor<cl::Buffer&, cl::Buffer&, cl::Buffer&>(program, "triad");
 
         // Create host vectors
         void *h_a = malloc(ARRAY_SIZE * DATATYPE_SIZE);