From 7f456d1e2b04980324602c483481fc34c4158f20 Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Tue, 7 Mar 2017 15:33:59 +0000
Subject: [PATCH] Move NonCopyable so it can be used outside the plugin

---
 Source/Carla/Carla.h                    |  2 +-
 Source/{Common => Carla}/NonCopyable.h  |  0
 Source/CarlaServer/source/Carla.h       |  2 +-
 Source/CarlaServer/source/NonCopyable.h | 11 +++++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 rename Source/{Common => Carla}/NonCopyable.h (100%)
 create mode 100644 Source/CarlaServer/source/NonCopyable.h

diff --git a/Source/Carla/Carla.h b/Source/Carla/Carla.h
index a89636d26..95ba27af1 100644
--- a/Source/Carla/Carla.h
+++ b/Source/Carla/Carla.h
@@ -6,7 +6,7 @@
 
 #include "ModuleManager.h"
 
-#include "../Common/NonCopyable.h"
+#include "NonCopyable.h"
 
 DECLARE_LOG_CATEGORY_EXTERN(LogCarla, Log, All);
 
diff --git a/Source/Common/NonCopyable.h b/Source/Carla/NonCopyable.h
similarity index 100%
rename from Source/Common/NonCopyable.h
rename to Source/Carla/NonCopyable.h
diff --git a/Source/CarlaServer/source/Carla.h b/Source/CarlaServer/source/Carla.h
index a9448ee4f..1a0fd6440 100644
--- a/Source/CarlaServer/source/Carla.h
+++ b/Source/CarlaServer/source/Carla.h
@@ -2,4 +2,4 @@
 
 #define CARLA_API
 
-#include "../../Common/NonCopyable.h"
+#include "NonCopyable.h"
diff --git a/Source/CarlaServer/source/NonCopyable.h b/Source/CarlaServer/source/NonCopyable.h
new file mode 100644
index 000000000..839037aea
--- /dev/null
+++ b/Source/CarlaServer/source/NonCopyable.h
@@ -0,0 +1,11 @@
+#pragma once
+
+class CARLA_API NonCopyable {
+public:
+
+  NonCopyable() = default;
+
+  NonCopyable(const NonCopyable &) = delete;
+
+  void operator=(const NonCopyable &x) = delete;
+};