From 13b9723c4681c8a456ce95e98224d780f76be5b4 Mon Sep 17 00:00:00 2001 From: nsubiron Date: Tue, 2 Oct 2018 14:13:47 +0200 Subject: [PATCH] Make ThreadGroup inherit NonCopyable --- LibCarla/source/carla/ThreadGroup.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/LibCarla/source/carla/ThreadGroup.h b/LibCarla/source/carla/ThreadGroup.h index 285d0bfae..85986f2a7 100644 --- a/LibCarla/source/carla/ThreadGroup.h +++ b/LibCarla/source/carla/ThreadGroup.h @@ -6,19 +6,18 @@ #pragma once +#include "carla/NonCopyable.h" + #include #include namespace carla { - class ThreadGroup { + class ThreadGroup : private NonCopyable { public: ThreadGroup() = default; - ThreadGroup(const ThreadGroup &) = delete; - ThreadGroup &operator=(const ThreadGroup &) = delete; - ~ThreadGroup() { JoinAll(); }