diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CL/CLHOGAccessor.h | 6 | ||||
-rw-r--r-- | tests/NEON/HOGAccessor.h | 6 | ||||
-rw-r--r-- | tests/Utils.h | 1 | ||||
-rw-r--r-- | tests/framework/TestCaseFactory.h | 4 | ||||
-rw-r--r-- | tests/framework/Utils.h | 2 | ||||
-rw-r--r-- | tests/framework/datasets/ContainerDataset.h | 4 | ||||
-rw-r--r-- | tests/framework/instruments/Instrument.h | 4 |
7 files changed, 11 insertions, 16 deletions
diff --git a/tests/CL/CLHOGAccessor.h b/tests/CL/CLHOGAccessor.h index 36a1be28a0..0d8751b5c3 100644 --- a/tests/CL/CLHOGAccessor.h +++ b/tests/CL/CLHOGAccessor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -52,10 +52,6 @@ public: CLHOGAccessor(const CLHOGAccessor &) = delete; /** Prevent instances of this class from being copied (As this class contains references). */ CLHOGAccessor &operator=(const CLHOGAccessor &) = delete; - /** Allow instances of this class to be moved */ - CLHOGAccessor(CLHOGAccessor &&) = default; - /** Allow instances of this class to be moved */ - CLHOGAccessor &operator=(CLHOGAccessor &&) = default; /** Pointer to the first element of the array which stores the linear SVM coefficients of HOG descriptor * diff --git a/tests/NEON/HOGAccessor.h b/tests/NEON/HOGAccessor.h index 9b10c84d33..11f3f79fbb 100644 --- a/tests/NEON/HOGAccessor.h +++ b/tests/NEON/HOGAccessor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -46,10 +46,6 @@ public: HOGAccessor(const HOGAccessor &) = delete; /** Prevent instances of this class from being copied (As this class contains references). */ HOGAccessor &operator=(const HOGAccessor &) = delete; - /** Allow instances of this class to be moved */ - HOGAccessor(HOGAccessor &&) = default; - /** Allow instances of this class to be moved */ - HOGAccessor &operator=(HOGAccessor &&) = default; /** Pointer to the first element of the array which stores the linear SVM coefficients of HOG descriptor * diff --git a/tests/Utils.h b/tests/Utils.h index 3dc317f528..1cc3cb8b37 100644 --- a/tests/Utils.h +++ b/tests/Utils.h @@ -32,6 +32,7 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" +#include "support/StringSupport.h" #include "support/ToolchainSupport.h" #ifdef ARM_COMPUTE_CL diff --git a/tests/framework/TestCaseFactory.h b/tests/framework/TestCaseFactory.h index 7164f8f3e2..afd881e25b 100644 --- a/tests/framework/TestCaseFactory.h +++ b/tests/framework/TestCaseFactory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "DatasetModes.h" #include "TestCase.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include <memory> #include <string> diff --git a/tests/framework/Utils.h b/tests/framework/Utils.h index 0280daaae9..3f1d0ead53 100644 --- a/tests/framework/Utils.h +++ b/tests/framework/Utils.h @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_TEST_UTILS #define ARM_COMPUTE_TEST_UTILS -#include "support/ToolchainSupport.h" +#include "support/StringSupport.h" #include <algorithm> #include <cmath> diff --git a/tests/framework/datasets/ContainerDataset.h b/tests/framework/datasets/ContainerDataset.h index 20af8a4dac..bd63fb8b92 100644 --- a/tests/framework/datasets/ContainerDataset.h +++ b/tests/framework/datasets/ContainerDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #define ARM_COMPUTE_TEST_DATASET_CONTAINER #include "Dataset.h" -#include "support/ToolchainSupport.h" +#include "support/StringSupport.h" #include "tests/TypePrinter.h" #include <string> diff --git a/tests/framework/instruments/Instrument.h b/tests/framework/instruments/Instrument.h index ae4644b200..301ca2fc1b 100644 --- a/tests/framework/instruments/Instrument.h +++ b/tests/framework/instruments/Instrument.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,6 +24,8 @@ #ifndef ARM_COMPUTE_TEST_INSTRUMENT #define ARM_COMPUTE_TEST_INSTRUMENT +#include "support/MemorySupport.h" + #include "../Utils.h" #include "Measurement.h" |