From 7966768c8070ff751c3b2cd36028a2d63dc47184 Mon Sep 17 00:00:00 2001
From: Kyle Lutz <kyle.r.lutz@gmail.com>
Date: Sat, 12 Apr 2014 09:37:37 -0700
Subject: [PATCH] Remove read/write buffer convenience overloads in
 command_queue

---
 example/simple_kernel.cpp               |  6 +++---
 include/boost/compute/command_queue.hpp | 28 -------------------------
 test/test_command_queue.cpp             |  6 +++---
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/example/simple_kernel.cpp b/example/simple_kernel.cpp
index f1b281e9..11709c12 100644
--- a/example/simple_kernel.cpp
+++ b/example/simple_kernel.cpp
@@ -70,14 +70,14 @@ int main()
     compute::command_queue queue(context, device);
 
     // write the data from 'a' and 'b' to the device
-    queue.enqueue_write_buffer(buffer_a, a);
-    queue.enqueue_write_buffer(buffer_b, b);
+    queue.enqueue_write_buffer(buffer_a, 0, 4 * sizeof(float), a);
+    queue.enqueue_write_buffer(buffer_b, 0, 4 * sizeof(float), b);
 
     // run the add kernel
     queue.enqueue_1d_range_kernel(kernel, 0, 4, 0);
 
     // transfer results back to the host array 'c'
-    queue.enqueue_read_buffer(buffer_c, c);
+    queue.enqueue_read_buffer(buffer_c, 0, 4 * sizeof(float), c);
 
     // print out results in 'c'
     std::cout << "c: [" << c[0] << ", "
diff --git a/include/boost/compute/command_queue.hpp b/include/boost/compute/command_queue.hpp
index 720a99a7..97cd1e5c 100644
--- a/include/boost/compute/command_queue.hpp
+++ b/include/boost/compute/command_queue.hpp
@@ -193,20 +193,6 @@ public:
         return get_info<cl_command_queue_properties>(CL_QUEUE_PROPERTIES);
     }
 
-    /// \internal_
-    cl_int enqueue_read_buffer(const buffer &buffer, void *host_ptr)
-    {
-        return enqueue_read_buffer(buffer, 0, buffer.size(), host_ptr);
-    }
-
-    /// \internal_
-    cl_int enqueue_read_buffer(const buffer &buffer,
-                               size_t size,
-                               void *host_ptr)
-    {
-        return enqueue_read_buffer(buffer, 0, size, host_ptr);
-    }
-
     /// Enqueues a command to read data from \p buffer to host memory.
     ///
     /// \see_opencl_ref{clEnqueueReadBuffer}
@@ -315,20 +301,6 @@ public:
     }
     #endif // CL_VERSION_1_1
 
-    /// \internal_
-    cl_int enqueue_write_buffer(const buffer &buffer, const void *host_ptr)
-    {
-        return enqueue_write_buffer(buffer, 0, buffer.size(), host_ptr);
-    }
-
-    /// \internal_
-    cl_int enqueue_write_buffer(const buffer &buffer,
-                                size_t size,
-                                const void *host_ptr)
-    {
-        return enqueue_write_buffer(buffer, 0, size, host_ptr);
-    }
-
     /// Enqueues a command to write data from host memory to \p buffer.
     ///
     /// \see_opencl_ref{clEnqueueWriteBuffer}
diff --git a/test/test_command_queue.cpp b/test/test_command_queue.cpp
index f2c8ace9..c6f719d3 100644
--- a/test/test_command_queue.cpp
+++ b/test/test_command_queue.cpp
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(kernel_profiling)
     boost::compute::buffer buffer(context, sizeof(data));
 
     // copy input data to device
-    queue.enqueue_write_buffer(buffer, sizeof(data), data);
+    queue.enqueue_write_buffer(buffer, 0, sizeof(data), data);
 
     // setup kernel
     const char source[] =
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(kernel_profiling)
     event.get_profiling_info<cl_ulong>(bc::event::profiling_command_end);
 
     // read results back to host
-    queue.enqueue_read_buffer(buffer, sizeof(data), data);
+    queue.enqueue_read_buffer(buffer, 0, sizeof(data), data);
 
     // check results
     BOOST_CHECK_EQUAL(data[0], 2);
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(write_buffer_rect)
 
     // check output values
     int output[4];
-    queue.enqueue_read_buffer(buffer, 4 * sizeof(int), output);
+    queue.enqueue_read_buffer(buffer, 0, 4 * sizeof(int), output);
     BOOST_CHECK_EQUAL(output[0], 1);
     BOOST_CHECK_EQUAL(output[1], 3);
     BOOST_CHECK_EQUAL(output[2], 5);