diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-11-21 03:04:18 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-01 10:41:54 +0000 |
| commit | 40f51a63c8e7258db15269427ae4fe1ad199c550 (patch) | |
| tree | 353253a41863966995a45556731e7181a643c003 /utils/ImageLoader.h | |
| parent | 327800401c4185d98fcc01b9c9efbc038a4228ed (diff) | |
| download | ComputeLibrary-40f51a63c8e7258db15269427ae4fe1ad199c550.tar.gz | |
Update default C++ standard to C++14
(3RDPARTY_UPDATE)
Resolves: COMPMID-3849
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'utils/ImageLoader.h')
| -rw-r--r-- | utils/ImageLoader.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/ImageLoader.h b/utils/ImageLoader.h index 2dbb6f9421..5abcb7a60f 100644 --- a/utils/ImageLoader.h +++ b/utils/ImageLoader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -392,7 +392,7 @@ public: ARM_COMPUTE_ERROR_ON_MSG_VAR(max_val >= 256, "2 bytes per colour channel not supported in file %s", filename.c_str()); - _feeder = support::cpp14::make_unique<FileImageFeeder>(_fs); + _feeder = std::make_unique<FileImageFeeder>(_fs); } catch(std::runtime_error &e) { @@ -467,7 +467,7 @@ public: _height = height; _data = std::unique_ptr<uint8_t, malloc_deleter>(rgb_image); _is_loaded = true; - _feeder = support::cpp14::make_unique<MemoryImageFeeder>(_data.get()); + _feeder = std::make_unique<MemoryImageFeeder>(_data.get()); } } void close() override @@ -512,9 +512,9 @@ public: switch(type) { case ImageType::PPM: - return support::cpp14::make_unique<PPMLoader>(); + return std::make_unique<PPMLoader>(); case ImageType::JPEG: - return support::cpp14::make_unique<JPEGLoader>(); + return std::make_unique<JPEGLoader>(); case ImageType::UNKNOWN: default: return nullptr; |