diff options
Diffstat (limited to 'tests/framework/datasets/JoinDataset.h')
| -rw-r--r-- | tests/framework/datasets/JoinDataset.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/framework/datasets/JoinDataset.h b/tests/framework/datasets/JoinDataset.h index eded6e0259..d682c19d6b 100644 --- a/tests/framework/datasets/JoinDataset.h +++ b/tests/framework/datasets/JoinDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,8 +47,10 @@ template <typename T, typename U> class JoinDataset : public Dataset { private: - using iter1_type = typename T::iterator; - using iter2_type = typename U::iterator; + using T_noref = typename std::remove_reference<T>::type; + using U_noref = typename std::remove_reference<U>::type; + using iter1_type = typename T_noref::iterator; + using iter2_type = typename U_noref::iterator; public: /** Construct dataset from the given datasets. @@ -65,12 +67,12 @@ public: JoinDataset(JoinDataset &&) = default; /** Type of the dataset. */ - using type = typename T::type; + using type = typename T_noref::type; /** Iterator for the dataset. */ struct iterator { - iterator(const T *dataset1, const U *dataset2) + iterator(const T_noref *dataset1, const U_noref *dataset2) : _iter1{ dataset1->begin() }, _iter2{ dataset2->begin() }, _first_size{ dataset1->size() } { } |