diff options
| author | Martin Hořeňovský | 2023-08-29 15:37:46 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2023-08-29 15:38:13 +0200 |
| commit | f24d39e42b3b41215c7a9082f45381b32f78edbc (patch) | |
| tree | 4724704ae3bd2d442f413962746cfd4c9fabfb51 /src/catch2 | |
| parent | 85eb4652b46cc69c4ad7915c9fd3b009d99e9fb7 (diff) | |
| download | catch3-f24d39e42b3b41215c7a9082f45381b32f78edbc.tar.gz | |
Support C arrays and ADL ranges in from_range generator
Closes #2737
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/generators/catch_generators_range.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/catch2/generators/catch_generators_range.hpp b/src/catch2/generators/catch_generators_range.hpp index 495acb95..b67c1590 100644 --- a/src/catch2/generators/catch_generators_range.hpp +++ b/src/catch2/generators/catch_generators_range.hpp @@ -96,10 +96,11 @@ GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) { return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(from, to)); } -template <typename Container, - typename ResultType = typename Container::value_type> -GeneratorWrapper<ResultType> from_range(Container const& cnt) { - return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end())); +template <typename Container> +auto from_range(Container const& cnt) { + using std::begin; + using std::end; + return from_range( begin( cnt ), end( cnt ) ); } |