COMPMID-2819: Delete move semantics from classes that use std::mutex

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I6ea0ab7af7d2b9cb2dcb23627eb909cf7e88a5b0
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2775
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>

9 files changed, 45 insertions, 45 deletions

diff --git a/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h b/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h
index 5510252583..eeb6a65525 100644
--- a/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h
+++ b/arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -26,6 +26,7 @@
 
 #include "arm_compute/core/IArray.h"
 #include "arm_compute/core/NEON/INEKernel.h"
+
 #include "support/Mutex.h"
 
 #include <cstdint>
@@ -51,10 +52,10 @@ public:
     CPPCornerCandidatesKernel(const CPPCornerCandidatesKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     CPPCornerCandidatesKernel &operator=(const CPPCornerCandidatesKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    CPPCornerCandidatesKernel(CPPCornerCandidatesKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    CPPCornerCandidatesKernel &operator=(CPPCornerCandidatesKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    CPPCornerCandidatesKernel(CPPCornerCandidatesKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    CPPCornerCandidatesKernel &operator=(CPPCornerCandidatesKernel &&) = delete;
     /** Default destructor */
     ~CPPCornerCandidatesKernel() = default;
 
diff --git a/arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h b/arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h
index 82bd9c2876..acb35923d4 100644
--- a/arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h
+++ b/arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -47,10 +47,10 @@ public:
     NEHOGDetectorKernel(const NEHOGDetectorKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     NEHOGDetectorKernel &operator=(const NEHOGDetectorKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    NEHOGDetectorKernel(NEHOGDetectorKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    NEHOGDetectorKernel &operator=(NEHOGDetectorKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEHOGDetectorKernel(NEHOGDetectorKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEHOGDetectorKernel &operator=(NEHOGDetectorKernel &&) = delete;
     /** Default destructor */
     ~NEHOGDetectorKernel() = default;
 
diff --git a/arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h b/arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h
index b2956d8199..a77fe16ac2 100644
--- a/arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h
+++ b/arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,7 +30,6 @@
 #include "arm_compute/core/NEON/INEKernel.h"
 
 #include <cstdint>
-#include <mutex>
 
 namespace arm_compute
 {
diff --git a/arm_compute/core/NEON/kernels/NEHistogramKernel.h b/arm_compute/core/NEON/kernels/NEHistogramKernel.h
index 86642c8b72..b1dd105676 100644
--- a/arm_compute/core/NEON/kernels/NEHistogramKernel.h
+++ b/arm_compute/core/NEON/kernels/NEHistogramKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -52,10 +52,10 @@ public:
     NEHistogramKernel(const NEHistogramKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     NEHistogramKernel &operator=(const NEHistogramKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    NEHistogramKernel(NEHistogramKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    NEHistogramKernel &operator=(NEHistogramKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEHistogramKernel(NEHistogramKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEHistogramKernel &operator=(NEHistogramKernel &&) = delete;
 
     /** Set the input image and the distribution output.
      *
diff --git a/arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h b/arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h
index 517b1236a6..2197e3cfbe 100644
--- a/arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h
+++ b/arm_compute/core/NEON/kernels/NEMeanStdDevKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -48,10 +48,10 @@ public:
     NEMeanStdDevKernel(const NEMeanStdDevKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     NEMeanStdDevKernel &operator=(const NEMeanStdDevKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    NEMeanStdDevKernel(NEMeanStdDevKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    NEMeanStdDevKernel &operator=(NEMeanStdDevKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMeanStdDevKernel(NEMeanStdDevKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMeanStdDevKernel &operator=(NEMeanStdDevKernel &&) = delete;
     /** Default destructor */
     ~NEMeanStdDevKernel() = default;
 
diff --git a/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h b/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h
index 2eebaf9ee4..445e12af03 100644
--- a/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h
+++ b/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -48,10 +48,10 @@ public:
     NEMinMaxLayerKernel(const NEMinMaxLayerKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     NEMinMaxLayerKernel &operator=(const NEMinMaxLayerKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    NEMinMaxLayerKernel(NEMinMaxLayerKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    NEMinMaxLayerKernel &operator=(NEMinMaxLayerKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMinMaxLayerKernel(NEMinMaxLayerKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMinMaxLayerKernel &operator=(NEMinMaxLayerKernel &&) = delete;
     /** Default destructor */
     ~NEMinMaxLayerKernel() = default;
 
@@ -82,9 +82,9 @@ public:
 
 private:
     void update_min_max(float *out_ptr, float min, float max);
-    const ITensor *_input;
-    ITensor       *_output;
-    Mutex          _mtx;
+    const ITensor     *_input;
+    ITensor           *_output;
+    arm_compute::Mutex _mtx;
 };
 } // namespace arm_compute
 #endif /* ARM_COMPUTE_NEMINMAXLAYERKERNEL_H */
diff --git a/arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h b/arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h
index de02784b25..597a093d70 100644
--- a/arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h
+++ b/arm_compute/core/NEON/kernels/NEMinMaxLocationKernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -49,10 +49,10 @@ public:
     NEMinMaxKernel(const NEMinMaxKernel &) = delete;
     /** Prevent instances of this class from being copied (As this class contains pointers) */
     NEMinMaxKernel &operator=(const NEMinMaxKernel &) = delete;
-    /** Allow instances of this class to be moved */
-    NEMinMaxKernel(NEMinMaxKernel &&) = default;
-    /** Allow instances of this class to be moved */
-    NEMinMaxKernel &operator=(NEMinMaxKernel &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMinMaxKernel(NEMinMaxKernel &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    NEMinMaxKernel &operator=(NEMinMaxKernel &&) = delete;
     /** Default destructor */
     ~NEMinMaxKernel() = default;
 
diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h
index c0c812988d..dce92c67f1 100644
--- a/arm_compute/graph/Graph.h
+++ b/arm_compute/graph/Graph.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 ARM Limited.
+ * Copyright (c) 2018-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -64,10 +64,10 @@ public:
     Graph(const Graph &) = delete;
     /** Prevent instances of this class from being copy assigned (As this class contains pointers) */
     Graph &operator=(const Graph &) = delete;
-    /** Allow instances of this class to be moved */
-    Graph(Graph &&) = default;
-    /** Allow instances of this class to be move assigned */
-    Graph &operator=(Graph &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    Graph(Graph &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    Graph &operator=(Graph &&) = delete;
     /** Adds a node to the graph
      *
      * @note Models a single output node
diff --git a/arm_compute/runtime/PoolManager.h b/arm_compute/runtime/PoolManager.h
index 594b507ff2..2ee00bceab 100644
--- a/arm_compute/runtime/PoolManager.h
+++ b/arm_compute/runtime/PoolManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -47,10 +47,10 @@ public:
     PoolManager(const PoolManager &) = delete;
     /** Prevent instances of this class to be copied */
     PoolManager &operator=(const PoolManager &) = delete;
-    /** Allow instances of this class to be move constructed */
-    PoolManager(PoolManager &&) = default;
-    /** Allow instances of this class to be moved */
-    PoolManager &operator=(PoolManager &&) = default;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    PoolManager(PoolManager &&) = delete;
+    /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+    PoolManager &operator=(PoolManager &&) = delete;
 
     // Inherited methods overridden:
     IMemoryPool *lock_pool() override;