Skip to content

Commit

Permalink
Merge remote-tracking branch 'la-vache/master' into concept-quantity-bis
Browse files Browse the repository at this point in the history
  • Loading branch information
eggrobin committed Mar 23, 2024
2 parents 3146cf9 + ece93a6 commit 63f9067
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions quantities/concepts.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ concept quantity = instance_of<T, Quantity> || std::same_as<T, double>;

// std::integral || std::floating_point rather than
// std::convertible_to<double, T> because
// the former introduces ambiguities on Sign * Vector.
// the latter introduces ambiguities on Sign * Vector.
template<typename T>
concept convertible_to_quantity = quantity<std::remove_cvref_t<T>> ||
std::integral<T> || std::floating_point<T>;
concept convertible_to_quantity =
quantity<std::remove_cvref_t<T>> ||
std::integral<std::remove_cvref_t<T>> ||
std::floating_point<std::remove_cvref_t<T>>;

} // namespace internal

Expand Down

0 comments on commit 63f9067

Please sign in to comment.