From e91c31b44af503f45ac554c01ec25ac4348163d2 Mon Sep 17 00:00:00 2001 From: Tom Deakin Date: Tue, 3 May 2016 11:37:35 +0100 Subject: [PATCH] Tidy up delete of object with correct deconstructors and delete --- src/OCLStream.cpp | 8 ++++---- src/Stream.h | 3 +++ src/main.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/OCLStream.cpp b/src/OCLStream.cpp index e962ea5..5a72b3c 100644 --- a/src/OCLStream.cpp +++ b/src/OCLStream.cpp @@ -103,10 +103,10 @@ OCLStream::OCLStream(const unsigned int ARRAY_SIZE, const int device_index) template OCLStream::~OCLStream() { - delete[] copy_kernel; - delete[] mul_kernel; - delete[] add_kernel; - delete[] triad_kernel; + delete copy_kernel; + delete mul_kernel; + delete add_kernel; + delete triad_kernel; } template diff --git a/src/Stream.h b/src/Stream.h index 527fe6a..e02c953 100644 --- a/src/Stream.h +++ b/src/Stream.h @@ -8,6 +8,9 @@ template class Stream { public: + + virtual ~Stream(){} + // Kernels // These must be blocking calls virtual void copy() = 0; diff --git a/src/main.cpp b/src/main.cpp index a0fbaf9..457ca9a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -154,7 +154,7 @@ void run() } - delete[] stream; + delete stream; }