93 lines
4.5 KiB
Diff
93 lines
4.5 KiB
Diff
From a710725398952965a27f1942e6633814a0c6a30b Mon Sep 17 00:00:00 2001
|
||
From: marehr <marehr-github@marehr.dialup.fu-berlin.de>
|
||
Date: Wed, 29 Sep 2021 16:54:19 +0200
|
||
Subject: [PATCH] =?UTF-8?q?[FIX]=20error:=20testing=20if=20a=20concept-id?=
|
||
=?UTF-8?q?=20is=20a=20valid=20expression;=20add=20=E2=80=98requires?=
|
||
=?UTF-8?q?=E2=80=99=20to=20check=20satisfaction=20[-Werror=3Dmissing-requ?=
|
||
=?UTF-8?q?ires]?=
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
```
|
||
/seqan3/include/seqan3/utility/concept/exposition_only/core_language.hpp:59:5: error: testing if a concept-id is a valid expression; add ‘requires’ to check satisfaction [-Werror=missing-requires]
|
||
59 | std::convertible_to<decltype(v1 < v2), bool>;
|
||
| ^
|
||
| requires
|
||
```
|
||
---
|
||
.../concept/exposition_only/core_language.hpp | 26 +++++++++----------
|
||
include/seqan3/utility/range/concept.hpp | 16 ++++++------
|
||
2 files changed, 21 insertions(+), 21 deletions(-)
|
||
|
||
diff --git a/include/seqan3/utility/concept/exposition_only/core_language.hpp b/include/seqan3/utility/concept/exposition_only/core_language.hpp
|
||
index d842db4736..513e6195b5 100644
|
||
--- a/include/seqan3/utility/concept/exposition_only/core_language.hpp
|
||
+++ b/include/seqan3/utility/concept/exposition_only/core_language.hpp
|
||
@@ -31,10 +31,10 @@ SEQAN3_CONCEPT weakly_equality_comparable_with =
|
||
requires(std::remove_reference_t<T> const & t,
|
||
std::remove_reference_t<U> const & u)
|
||
{
|
||
- std::convertible_to<decltype(t == u), bool>;
|
||
- std::convertible_to<decltype(t != u), bool>;
|
||
- std::convertible_to<decltype(u == t), bool>;
|
||
- std::convertible_to<decltype(u != t), bool>;
|
||
+ requires std::convertible_to<decltype(t == u), bool>;
|
||
+ requires std::convertible_to<decltype(t != u), bool>;
|
||
+ requires std::convertible_to<decltype(u == t), bool>;
|
||
+ requires std::convertible_to<decltype(u != t), bool>;
|
||
};
|
||
//!\endcond
|
||
|
||
@@ -56,15 +56,15 @@ template <typename t1, typename t2>
|
||
SEQAN3_CONCEPT weakly_ordered_with = requires (std::remove_reference_t<t1> const & v1,
|
||
std::remove_reference_t<t2> const & v2)
|
||
{
|
||
- std::convertible_to<decltype(v1 < v2), bool>;
|
||
- std::convertible_to<decltype(v1 <= v2), bool>;
|
||
- std::convertible_to<decltype(v1 > v2), bool>;
|
||
- std::convertible_to<decltype(v1 >= v2), bool>;
|
||
-
|
||
- std::convertible_to<decltype(v2 < v1), bool>;
|
||
- std::convertible_to<decltype(v2 <= v1), bool>;
|
||
- std::convertible_to<decltype(v2 > v1), bool>;
|
||
- std::convertible_to<decltype(v2 >= v1), bool>;
|
||
+ requires std::convertible_to<decltype(v1 < v2), bool>;
|
||
+ requires std::convertible_to<decltype(v1 <= v2), bool>;
|
||
+ requires std::convertible_to<decltype(v1 > v2), bool>;
|
||
+ requires std::convertible_to<decltype(v1 >= v2), bool>;
|
||
+
|
||
+ requires std::convertible_to<decltype(v2 < v1), bool>;
|
||
+ requires std::convertible_to<decltype(v2 <= v1), bool>;
|
||
+ requires std::convertible_to<decltype(v2 > v1), bool>;
|
||
+ requires std::convertible_to<decltype(v2 >= v1), bool>;
|
||
};
|
||
//!\endcond
|
||
|
||
diff --git a/include/seqan3/utility/range/concept.hpp b/include/seqan3/utility/range/concept.hpp
|
||
index e047dcc8f8..b90e967230 100644
|
||
--- a/include/seqan3/utility/range/concept.hpp
|
||
+++ b/include/seqan3/utility/range/concept.hpp
|
||
@@ -91,14 +91,14 @@ SEQAN3_CONCEPT pseudo_random_access_iterator =
|
||
std::sized_sentinel_for<iterator_t, iterator_t> &&
|
||
requires (iterator_t i, iterator_t const j, std::iter_difference_t<iterator_t> const n)
|
||
{
|
||
- std::same_as<decltype( i += n ), iterator_t &>;
|
||
- std::same_as<decltype( j + n ), iterator_t>;
|
||
- std::same_as<decltype( n + j ), iterator_t>;
|
||
- std::same_as<decltype( --i ), iterator_t &>;
|
||
- std::same_as<decltype( i-- ), iterator_t>;
|
||
- std::same_as<decltype( i -= n ), iterator_t &>;
|
||
- std::same_as<decltype( j - n ), iterator_t>;
|
||
- std::same_as<decltype( j[n] ), std::iter_reference_t<iterator_t>>;
|
||
+ requires std::same_as<decltype( i += n ), iterator_t &>;
|
||
+ requires std::same_as<decltype( j + n ), iterator_t>;
|
||
+ requires std::same_as<decltype( n + j ), iterator_t>;
|
||
+ requires std::same_as<decltype( --i ), iterator_t &>;
|
||
+ requires std::same_as<decltype( i-- ), iterator_t>;
|
||
+ requires std::same_as<decltype( i -= n ), iterator_t &>;
|
||
+ requires std::same_as<decltype( j - n ), iterator_t>;
|
||
+ requires std::same_as<decltype( j[n] ), std::iter_reference_t<iterator_t>>;
|
||
};
|
||
//!\endcond
|
||
|