diff options
| author | Ioan-Cristian Szabo <ioan-cristian.szabo@arm.com> | 2017-10-26 15:42:24 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | 33fd07bd27be3cba183b7cacef63ea220c770c23 (patch) | |
| tree | 0ccd4269992a90542697c85a0bd1c690872327b5 /tests/AssetsLibrary.cpp | |
| parent | eae4ce085ed44c67de6d87eeba7726570ac23787 (diff) | |
| download | ComputeLibrary-33fd07bd27be3cba183b7cacef63ea220c770c23.tar.gz | |
COMPMID-634: Enable clang with libc++ to compile for Android (32 and 64 bits)
Change-Id: I693f64e70cd478e93675a8b04360128ded3b60d4
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93015
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/AssetsLibrary.cpp')
| -rw-r--r-- | tests/AssetsLibrary.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/AssetsLibrary.cpp b/tests/AssetsLibrary.cpp index 87b0389039..f5eac8a59a 100644 --- a/tests/AssetsLibrary.cpp +++ b/tests/AssetsLibrary.cpp @@ -355,7 +355,7 @@ const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &nam { std::lock_guard<std::mutex> guard(_format_lock); - const RawTensor *ptr = _cache.find(std::make_tuple(name, format)); + const RawTensor *ptr = _cache.find(std::forward_as_tuple(name, format)); if(ptr != nullptr) { @@ -372,14 +372,14 @@ const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &nam raw = std::move(dst); } - return _cache.add(std::make_tuple(name, format), std::move(raw)); + return _cache.add(std::forward_as_tuple(name, format), std::move(raw)); } const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &name, Format format, Channel channel) const { std::lock_guard<std::mutex> guard(_channel_lock); - const RawTensor *ptr = _cache.find(std::make_tuple(name, format, channel)); + const RawTensor *ptr = _cache.find(std::forward_as_tuple(name, format, channel)); if(ptr != nullptr) { @@ -392,7 +392,7 @@ const RawTensor &AssetsLibrary::find_or_create_raw_tensor(const std::string &nam (*get_extractor(format, channel))(src, dst); - return _cache.add(std::make_tuple(name, format, channel), std::move(dst)); + return _cache.add(std::forward_as_tuple(name, format, channel), std::move(dst)); } TensorShape AssetsLibrary::get_image_shape(const std::string &name) |