COMPMID-3953: Move assignment operator failures on android
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Change-Id: Id37d90e29749c50eb58084ae9a1ef78e84dbdcd7
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4326
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
index 378fce7..97b1a47 100644
--- a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h
@@ -82,10 +82,10 @@
NEDeconvolutionLayer(const NEDeconvolutionLayer &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEDeconvolutionLayer &operator=(const NEDeconvolutionLayer &) = delete;
- /** Allow instances of this class to be moved */
- NEDeconvolutionLayer(NEDeconvolutionLayer &&) = default;
- /** Allow instances of this class to be moved */
- NEDeconvolutionLayer &operator=(NEDeconvolutionLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEDeconvolutionLayer(NEDeconvolutionLayer &&) = delete;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEDeconvolutionLayer &operator=(NEDeconvolutionLayer &&) = delete;
/** Default destructor */
virtual ~NEDeconvolutionLayer() = default;
diff --git a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
index b3e98fc..37750e2 100644
--- a/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEFFTConvolutionLayer.h
@@ -63,12 +63,12 @@
NEFFTConvolutionLayer(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEFFTConvolutionLayer(const NEFFTConvolutionLayer &) = delete;
- /** Default move constructor */
- NEFFTConvolutionLayer(NEFFTConvolutionLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEFFTConvolutionLayer(NEFFTConvolutionLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEFFTConvolutionLayer &operator=(const NEFFTConvolutionLayer &) = delete;
- /** Default move assignment operator */
- NEFFTConvolutionLayer &operator=(NEFFTConvolutionLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEFFTConvolutionLayer &operator=(NEFFTConvolutionLayer &&) = delete;
/** Default destructor */
~NEFFTConvolutionLayer();
/** Set the input and output tensors.
diff --git a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
index 3ab3d81..0a7748a 100644
--- a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h
@@ -127,12 +127,12 @@
NEFullyConnectedLayer(std::shared_ptr<IMemoryManager> memory_manager = nullptr, IWeightsManager *weights_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEFullyConnectedLayer(const NEFullyConnectedLayer &) = delete;
- /** Default move constructor */
- NEFullyConnectedLayer(NEFullyConnectedLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEFullyConnectedLayer(NEFullyConnectedLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEFullyConnectedLayer &operator=(const NEFullyConnectedLayer &) = delete;
- /** Default move assignment operator */
- NEFullyConnectedLayer &operator=(NEFullyConnectedLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEFullyConnectedLayer &operator=(NEFullyConnectedLayer &&) = delete;
/** Default destructor */
~NEFullyConnectedLayer();
/** Set the input and output tensors.
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
index 6bcf56f..59d83ed 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
@@ -54,12 +54,12 @@
NEConvolutionLayerReshapeWeights();
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEConvolutionLayerReshapeWeights(const NEConvolutionLayerReshapeWeights &) = delete;
- /** Default move constructor */
- NEConvolutionLayerReshapeWeights(NEConvolutionLayerReshapeWeights &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEConvolutionLayerReshapeWeights(NEConvolutionLayerReshapeWeights &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEConvolutionLayerReshapeWeights &operator=(const NEConvolutionLayerReshapeWeights &) = delete;
- /** Default move assignment operator */
- NEConvolutionLayerReshapeWeights &operator=(NEConvolutionLayerReshapeWeights &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEConvolutionLayerReshapeWeights &operator=(NEConvolutionLayerReshapeWeights &&) = delete;
/** Default destructor */
~NEConvolutionLayerReshapeWeights();
/** Set the input and output tensors.
@@ -167,12 +167,12 @@
NEGEMMConvolutionLayer(const std::shared_ptr<IMemoryManager> &memory_manager = nullptr, IWeightsManager *weights_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEGEMMConvolutionLayer(const NEGEMMConvolutionLayer &) = delete;
- /** Default move constructor */
- NEGEMMConvolutionLayer(NEGEMMConvolutionLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEGEMMConvolutionLayer(NEGEMMConvolutionLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEGEMMConvolutionLayer &operator=(const NEGEMMConvolutionLayer &) = delete;
- /** Default move assignment operator */
- NEGEMMConvolutionLayer &operator=(NEGEMMConvolutionLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains non movable objects) */
+ NEGEMMConvolutionLayer &operator=(NEGEMMConvolutionLayer &&) = delete;
/** Default destructor */
~NEGEMMConvolutionLayer();
/** Set the input and output tensors.
diff --git a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
index 0fb3edd..f273e55 100644
--- a/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
+++ b/arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h
@@ -62,12 +62,12 @@
NEHOGMultiDetection(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEHOGMultiDetection(const NEHOGMultiDetection &) = delete;
- /** Default move constructor */
- NEHOGMultiDetection(NEHOGMultiDetection &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEHOGMultiDetection(NEHOGMultiDetection &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEHOGMultiDetection &operator=(const NEHOGMultiDetection &) = delete;
- /** Default move assignment operator */
- NEHOGMultiDetection &operator=(NEHOGMultiDetection &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEHOGMultiDetection &operator=(NEHOGMultiDetection &&) = delete;
/** Default destructor */
~NEHOGMultiDetection();
/** Initialise the function's source, destination, detection window strides, border mode, threshold and non-maxima suppression
diff --git a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
index 39fafef..a354a4d 100644
--- a/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
+++ b/arm_compute/runtime/NEON/functions/NELSTMLayerQuantized.h
@@ -67,12 +67,12 @@
NELSTMLayerQuantized(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NELSTMLayerQuantized(const NELSTMLayerQuantized &) = delete;
- /** Default move constructor */
- NELSTMLayerQuantized(NELSTMLayerQuantized &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NELSTMLayerQuantized(NELSTMLayerQuantized &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NELSTMLayerQuantized &operator=(const NELSTMLayerQuantized &) = delete;
- /** Default move assignment operator */
- NELSTMLayerQuantized &operator=(NELSTMLayerQuantized &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NELSTMLayerQuantized &operator=(NELSTMLayerQuantized &&) = delete;
/** Default destructor */
~NELSTMLayerQuantized();
/** Initialize function's tensors.
diff --git a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
index e9f3e93..86e6300 100644
--- a/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
+++ b/arm_compute/runtime/NEON/functions/NELocallyConnectedLayer.h
@@ -55,12 +55,12 @@
NELocallyConnectedLayer(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NELocallyConnectedLayer(const NELocallyConnectedLayer &) = delete;
- /** Default move constructor */
- NELocallyConnectedLayer(NELocallyConnectedLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NELocallyConnectedLayer(NELocallyConnectedLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NELocallyConnectedLayer &operator=(const NELocallyConnectedLayer &) = delete;
- /** Default move assignment operator */
- NELocallyConnectedLayer &operator=(NELocallyConnectedLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NELocallyConnectedLayer &operator=(NELocallyConnectedLayer &&) = delete;
/** Default destructor */
~NELocallyConnectedLayer();
/** Set the input and output tensors.
diff --git a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h
index 17ad5a3..fcabc1d 100644
--- a/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h
@@ -67,12 +67,12 @@
NEQLSTMLayer(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEQLSTMLayer(const NEQLSTMLayer &) = delete;
- /** Default move constructor */
- NEQLSTMLayer(NEQLSTMLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEQLSTMLayer(NEQLSTMLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NEQLSTMLayer &operator=(const NEQLSTMLayer &) = delete;
- /** Default move assignment operator */
- NEQLSTMLayer &operator=(NEQLSTMLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NEQLSTMLayer &operator=(NEQLSTMLayer &&) = delete;
/** Default destructor */
~NEQLSTMLayer();
/** Initialize function's tensors.
diff --git a/arm_compute/runtime/NEON/functions/NERNNLayer.h b/arm_compute/runtime/NEON/functions/NERNNLayer.h
index 74fdc59..c42b303 100644
--- a/arm_compute/runtime/NEON/functions/NERNNLayer.h
+++ b/arm_compute/runtime/NEON/functions/NERNNLayer.h
@@ -44,12 +44,12 @@
NERNNLayer(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
NERNNLayer(const NERNNLayer &) = delete;
- /** Default move constructor */
- NERNNLayer(NERNNLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NERNNLayer(NERNNLayer &&) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
NERNNLayer &operator=(const NERNNLayer &) = delete;
- /** Default move assignment operator */
- NERNNLayer &operator=(NERNNLayer &&) = default;
+ /** Prevent instances of this class from being moved (As this class contains pointers) */
+ NERNNLayer &operator=(NERNNLayer &&) = delete;
/** Default destructor */
~NERNNLayer();
/** Initialize the function