From 1db9a6b64848e114794c31b0c5bede911f99be7c Mon Sep 17 00:00:00 2001
From: Tom Deakin <tom.deakin@bristol.ac.uk>
Date: Mon, 8 Feb 2021 11:33:03 +0000
Subject: [PATCH] [SYCL 2020] Use smart pointers instead of raw pointers

---
 SYCLStream.cpp | 24 ++++++++++--------------
 SYCLStream.h   | 13 +++++++------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/SYCLStream.cpp b/SYCLStream.cpp
index 8a1010e..0f65560 100644
--- a/SYCLStream.cpp
+++ b/SYCLStream.cpp
@@ -51,24 +51,20 @@ SYCLStream<T>::SYCLStream(const int ARRAY_SIZE, const int device_index)
       throw std::runtime_error("SYCL errors detected");
     }
   }});
+
+  // No longer need list of devices
+  devices.clear();
+  cached = true;
   
   // Create buffers
-  d_a = new sycl::buffer<T>(array_size);
-  d_b = new sycl::buffer<T>(array_size);
-  d_c = new sycl::buffer<T>(array_size);
-  d_sum = new sycl::buffer<T>(1);
+  // Only in the constructor at runtime do we know the size, so need to use (smart) pointers
+  d_a = std::make_unique<sycl::buffer<T>>(array_size);
+  d_b = std::make_unique<sycl::buffer<T>>(array_size);
+  d_c = std::make_unique<sycl::buffer<T>>(array_size);
+  d_sum = std::make_unique<sycl::buffer<T>>(1);
+
 }
 
-template <class T>
-SYCLStream<T>::~SYCLStream()
-{
-  delete d_a;
-  delete d_b;
-  delete d_c;
-  delete d_sum;
-  delete queue;
-  devices.clear();
-}
 
 template <class T>
 void SYCLStream<T>::copy()
diff --git a/SYCLStream.h b/SYCLStream.h
index 3ebea6c..bfe9ae5 100644
--- a/SYCLStream.h
+++ b/SYCLStream.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <sstream>
+#include <memory>
 
 #include "Stream.h"
 
@@ -23,16 +24,16 @@ class SYCLStream : public Stream<T>
     int array_size;
 
     // SYCL objects
-    sycl::queue *queue;
-    sycl::buffer<T> *d_a;
-    sycl::buffer<T> *d_b;
-    sycl::buffer<T> *d_c;
-    sycl::buffer<T> *d_sum;
+    std::unique_ptr<sycl::queue> queue;
+    std::unique_ptr<sycl::buffer<T>> d_a;
+    std::unique_ptr<sycl::buffer<T>> d_b;
+    std::unique_ptr<sycl::buffer<T>> d_c;
+    std::unique_ptr<sycl::buffer<T>> d_sum;
 
   public:
 
     SYCLStream(const int, const int);
-    ~SYCLStream();
+    ~SYCLStream() = default;
 
     virtual void copy() override;
     virtual void add() override;