Skip to content

Commit

Permalink
Merge pull request #1471 from marehr/update_range_to_0.10.0
Browse files Browse the repository at this point in the history
Update range library to 0.10.0
  • Loading branch information
smehringer authored Jan 17, 2020
2 parents d6ca5e3 + 142795a commit e22a79c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ If possible, provide tooling that performs the changes, e.g. a shell-script.

## API changes

* **The required version of the ranges-v3 library has increased:** We now support the versions >= 0.10.0 and < 0.11.0,
increasing the previous requirement of >= 0.5.0 and < 0.6.0.
* **Customising for third party types has changes slightly:**
You are only affected if you added types to `seqan3::custom::`.
Please see [About Customisation](http://docs.seqan.de/seqan/3-master-user/about_customisation.html).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Please see the [online documentation](https://docs.seqan.de/seqan/3-master-user/
|**compiler** | [GCC](https://gcc.gnu.org) | ≥ 7 | no other compiler is currently supported! |
|**build system** | [CMake](https://cmake.org) | ≥ 3.4 | optional, but recommended |
|**required libs** | [SDSL](https://github.com/xxsds/sdsl-lite) | ≥ 3 | |
| | [Range-V3](https://github.com/ericniebler/range-v3) |1.0 | |
| | [Range-V3](https://github.com/ericniebler/range-v3) |0.10.0 | |
|**optional libs** | [cereal](https://github.com/USCiLab/cereal) | ≥ 1.2.3 | required for serialisation and CTD support |
| | [zlib](https://github.com/madler/zlib) | ≥ 1.2 | required for `*.gz` and `.bam` file support |
| | [bzip2](http://www.bzip.org) | ≥ 1.0 | required for `*.bz2` file support |
Expand Down
4 changes: 2 additions & 2 deletions include/seqan3/core/platform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@

// Ranges [required]
#if __has_include(<range/v3/version.hpp>)
# define RANGE_V3_MINVERSION 900
# define RANGE_V3_MAXVERSION 999
# define RANGE_V3_MINVERSION 1000
# define RANGE_V3_MAXVERSION 1099
// TODO the following doesn't actually show the current version, only its formula. How'd you do it?
# define MSG "Your version: " STR(RANGE_V3_VERSION) \
"; minimum version: " STR(RANGE_V3_MINVERSION) \
Expand Down
19 changes: 19 additions & 0 deletions include/seqan3/std/span
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,25 @@ struct is_std_array_impl<array<span_tp, span_sz>> : public true_type {};
template <class span_tp>
struct is_std_array : public is_std_array_impl<remove_cv_t<span_tp>> {};

} // namespace std

#if RANGE_V3_VERSION >= 901
namespace ranges
{
// forward declare in case we deal with an old version (between >= 0.9.1 and < 0.10.0) of ranges v3
#if RANGE_V3_VERSION < 1000
template<class span_tp>
inline constexpr bool enable_safe_range;
#endif // RANGE_V3_VERSION < 1000

template<class span_tp>
requires std::is_span<span_tp>::value
inline constexpr bool enable_safe_range<span_tp> = true;
} // namespace ranges
#endif // RANGE_V3_VERSION >= 901

namespace std
{
template <typename span_tp, ptrdiff_t span_extent>
class span {
public:
Expand Down
2 changes: 1 addition & 1 deletion submodules/range-v3
Submodule range-v3 updated 308 files

0 comments on commit e22a79c

Please sign in to comment.