From f5f2391f0d925f2a8d0833114f63bd8cb1da27b1 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Thu, 5 Mar 2020 22:32:16 +0000 Subject: COMPMID-3069: Silence clang-8 warning wrt explicit default of deleted operator Signed-off-by: Matthew Bentham Change-Id: Ib94d2770dd7991a1d5aa5e63edcc96714b183033 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/229015 Tested-by: bsgcomp Reviewed-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2851 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/graph/frontend/Stream.h | 6 +----- arm_compute/runtime/CL/CLRuntimeContext.h | 6 +----- arm_compute/runtime/CL/CLTensor.h | 10 +++++----- arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h | 6 +----- arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h | 6 +----- examples/graph_inception_resnet_v1.cpp | 4 +--- examples/graph_mobilenet.cpp | 4 +--- examples/graph_mobilenet_v2.cpp | 4 +--- examples/graph_resnet12.cpp | 6 ++---- examples/graph_srcnn955.cpp | 6 ++---- examples/graph_ssd_mobilenet.cpp | 6 ++---- examples/graph_vgg_vdsr.cpp | 6 ++---- tests/CL/CLAccessor.h | 4 +--- tests/NEON/Accessor.h | 4 +--- 14 files changed, 22 insertions(+), 56 deletions(-) diff --git a/arm_compute/graph/frontend/Stream.h b/arm_compute/graph/frontend/Stream.h index 1d9fc1ac35..b52274eeae 100644 --- a/arm_compute/graph/frontend/Stream.h +++ b/arm_compute/graph/frontend/Stream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -53,12 +53,8 @@ public: Stream(size_t id, std::string name); /** Prevent instances of this class from being copied (As this class contains pointers) */ Stream(const Stream &) = delete; - /** Default move constructor */ - Stream(Stream &&) = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ Stream &operator=(const Stream &) = delete; - /** Default move assignment operator */ - Stream &operator=(Stream &&) = default; /** Finalizes the stream for an execution target * * @param[in] target Execution target diff --git a/arm_compute/runtime/CL/CLRuntimeContext.h b/arm_compute/runtime/CL/CLRuntimeContext.h index 5d4a2779a1..791d1deaa7 100644 --- a/arm_compute/runtime/CL/CLRuntimeContext.h +++ b/arm_compute/runtime/CL/CLRuntimeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -44,12 +44,8 @@ public: ~CLRuntimeContext() = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ CLRuntimeContext(const CLRuntimeContext &) = delete; - /** Default move constructor */ - CLRuntimeContext(CLRuntimeContext &&) = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ CLRuntimeContext &operator=(const CLRuntimeContext &) = delete; - /** Default move assignment operator */ - CLRuntimeContext &operator=(CLRuntimeContext &&) = default; /** CPU Scheduler setter */ void set_gpu_scheduler(CLScheduler *scheduler); diff --git a/arm_compute/runtime/CL/CLTensor.h b/arm_compute/runtime/CL/CLTensor.h index aaf46fbce0..102cb3636a 100644 --- a/arm_compute/runtime/CL/CLTensor.h +++ b/arm_compute/runtime/CL/CLTensor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 ARM Limited. + * Copyright (c) 2016-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -52,12 +52,12 @@ public: /** Destructor */ ~CLTensor() = default; - /** Default copy constructor */ - CLTensor(const CLTensor &) = default; + /** Prevent copying by construction */ + CLTensor(const CLTensor &) = delete; /** Default move constructor */ CLTensor(CLTensor &&) = default; - /** Default copy assignment */ - CLTensor &operator=(const CLTensor &) = default; + /** Prevent copaingy by assignment */ + CLTensor &operator=(const CLTensor &) = delete; /** Default move assignment operator */ CLTensor &operator=(CLTensor &&) = default; diff --git a/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h b/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h index 8c91a5d686..fb6967f7e5 100644 --- a/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h +++ b/arm_compute/runtime/CL/functions/CLGenerateProposalsLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -65,12 +65,8 @@ public: CLGenerateProposalsLayer(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ CLGenerateProposalsLayer(const CLGenerateProposalsLayer &) = delete; - /** Default move constructor */ - CLGenerateProposalsLayer(CLGenerateProposalsLayer &&) = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ CLGenerateProposalsLayer &operator=(const CLGenerateProposalsLayer &) = delete; - /** Default move assignment operator */ - CLGenerateProposalsLayer &operator=(CLGenerateProposalsLayer &&) = default; /** Set the input and output tensors. * diff --git a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h index 0e236891d1..7c470fbaf0 100644 --- a/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h +++ b/arm_compute/runtime/NEON/functions/NEGenerateProposalsLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -64,12 +64,8 @@ public: NEGenerateProposalsLayer(std::shared_ptr memory_manager = nullptr); /** Prevent instances of this class from being copied (As this class contains pointers) */ NEGenerateProposalsLayer(const NEGenerateProposalsLayer &) = delete; - /** Default move constructor */ - NEGenerateProposalsLayer(NEGenerateProposalsLayer &&) = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ NEGenerateProposalsLayer &operator=(const NEGenerateProposalsLayer &) = delete; - /** Default move assignment operator */ - NEGenerateProposalsLayer &operator=(NEGenerateProposalsLayer &&) = default; /** Set the input and output tensors. * diff --git a/examples/graph_inception_resnet_v1.cpp b/examples/graph_inception_resnet_v1.cpp index 599aa5c8ac..ea9bf8f5a9 100644 --- a/examples/graph_inception_resnet_v1.cpp +++ b/examples/graph_inception_resnet_v1.cpp @@ -49,9 +49,7 @@ public: } InceptionResNetV1Example(const InceptionResNetV1Example &) = delete; InceptionResNetV1Example &operator=(const InceptionResNetV1Example &) = delete; - InceptionResNetV1Example(InceptionResNetV1Example &&) = default; // NOLINT - InceptionResNetV1Example &operator=(InceptionResNetV1Example &&) = default; // NOLINT - ~InceptionResNetV1Example() override = default; + ~InceptionResNetV1Example() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/examples/graph_mobilenet.cpp b/examples/graph_mobilenet.cpp index 23653c52c8..bb893998be 100644 --- a/examples/graph_mobilenet.cpp +++ b/examples/graph_mobilenet.cpp @@ -45,9 +45,7 @@ public: } GraphMobilenetExample(const GraphMobilenetExample &) = delete; GraphMobilenetExample &operator=(const GraphMobilenetExample &) = delete; - GraphMobilenetExample(GraphMobilenetExample &&) = default; // NOLINT - GraphMobilenetExample &operator=(GraphMobilenetExample &&) = default; // NOLINT - ~GraphMobilenetExample() override = default; + ~GraphMobilenetExample() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/examples/graph_mobilenet_v2.cpp b/examples/graph_mobilenet_v2.cpp index 1f5b0ec1ac..0d6b4715c9 100644 --- a/examples/graph_mobilenet_v2.cpp +++ b/examples/graph_mobilenet_v2.cpp @@ -42,9 +42,7 @@ public: } GraphMobilenetV2Example(const GraphMobilenetV2Example &) = delete; GraphMobilenetV2Example &operator=(const GraphMobilenetV2Example &) = delete; - GraphMobilenetV2Example(GraphMobilenetV2Example &&) = default; // NOLINT - GraphMobilenetV2Example &operator=(GraphMobilenetV2Example &&) = default; // NOLINT - ~GraphMobilenetV2Example() override = default; + ~GraphMobilenetV2Example() override = default; bool do_setup(int argc, char **argv) override { diff --git a/examples/graph_resnet12.cpp b/examples/graph_resnet12.cpp index 33f29dd500..120cc9b755 100644 --- a/examples/graph_resnet12.cpp +++ b/examples/graph_resnet12.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,9 +47,7 @@ public: } GraphResNet12Example(const GraphResNet12Example &) = delete; GraphResNet12Example &operator=(const GraphResNet12Example &) = delete; - GraphResNet12Example(GraphResNet12Example &&) = default; // NOLINT - GraphResNet12Example &operator=(GraphResNet12Example &&) = default; // NOLINT - ~GraphResNet12Example() override = default; + ~GraphResNet12Example() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/examples/graph_srcnn955.cpp b/examples/graph_srcnn955.cpp index 29faf72ac2..18921065d7 100644 --- a/examples/graph_srcnn955.cpp +++ b/examples/graph_srcnn955.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,9 +47,7 @@ public: } GraphSRCNN955Example(const GraphSRCNN955Example &) = delete; GraphSRCNN955Example &operator=(const GraphSRCNN955Example &) = delete; - GraphSRCNN955Example(GraphSRCNN955Example &&) = default; // NOLINT - GraphSRCNN955Example &operator=(GraphSRCNN955Example &&) = default; // NOLINT - ~GraphSRCNN955Example() override = default; + ~GraphSRCNN955Example() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/examples/graph_ssd_mobilenet.cpp b/examples/graph_ssd_mobilenet.cpp index b3476b8e80..f2a8b30bb2 100644 --- a/examples/graph_ssd_mobilenet.cpp +++ b/examples/graph_ssd_mobilenet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -54,9 +54,7 @@ public: } GraphSSDMobilenetExample(const GraphSSDMobilenetExample &) = delete; GraphSSDMobilenetExample &operator=(const GraphSSDMobilenetExample &) = delete; - GraphSSDMobilenetExample(GraphSSDMobilenetExample &&) = default; // NOLINT - GraphSSDMobilenetExample &operator=(GraphSSDMobilenetExample &&) = default; // NOLINT - ~GraphSSDMobilenetExample() override = default; + ~GraphSSDMobilenetExample() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/examples/graph_vgg_vdsr.cpp b/examples/graph_vgg_vdsr.cpp index 870d3cb391..c308236f5b 100644 --- a/examples/graph_vgg_vdsr.cpp +++ b/examples/graph_vgg_vdsr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -48,9 +48,7 @@ public: } GraphVDSRExample(const GraphVDSRExample &) = delete; GraphVDSRExample &operator=(const GraphVDSRExample &) = delete; - GraphVDSRExample(GraphVDSRExample &&) = default; // NOLINT - GraphVDSRExample &operator=(GraphVDSRExample &&) = default; // NOLINT - ~GraphVDSRExample() override = default; + ~GraphVDSRExample() override = default; bool do_setup(int argc, char **argv) override { // Parse arguments diff --git a/tests/CL/CLAccessor.h b/tests/CL/CLAccessor.h index 4cfe083fe5..c0aee56b8a 100644 --- a/tests/CL/CLAccessor.h +++ b/tests/CL/CLAccessor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -50,8 +50,6 @@ public: CLAccessor &operator=(const CLAccessor &) = delete; /** Allow instances of this class to be move constructed */ CLAccessor(CLAccessor &&) = default; - /** Allow instances of this class to be moved */ - CLAccessor &operator=(CLAccessor &&) = default; /** Destructor that unmaps the CL memory. */ ~CLAccessor(); diff --git a/tests/NEON/Accessor.h b/tests/NEON/Accessor.h index 0c43f56009..9e031f4f72 100644 --- a/tests/NEON/Accessor.h +++ b/tests/NEON/Accessor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,8 +47,6 @@ public: Accessor &operator=(const Accessor &) = delete; /** Allow instances of this class to be move constructed */ Accessor(Accessor &&) = default; - /** Allow instances of this class to be moved */ - Accessor &operator=(Accessor &&) = default; /** Get the tensor data. * -- cgit v1.2.1