Fix warnings
diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index d2336ce..a45df7e 100644 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h
@@ -638,19 +638,23 @@ template <typename A> constexpr bool is_int_or_enum_v = std::is_enum<A>::value || std::is_integral<A>::value; +template <typename A, typename B> +inline constexpr void plain_enum_asserts(A a, B b) { + static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); + static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); +} + /// \internal Gets the minimum of two values which may be integers or enums template <typename A, typename B> inline constexpr int plain_enum_min(A a, B b) { - static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); - static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); + plain_enum_asserts(a, b); return ((int)a <= (int)b) ? (int)a : (int)b; } /// \internal Gets the maximum of two values which may be integers or enums template <typename A, typename B> inline constexpr int plain_enum_max(A a, B b) { - static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); - static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); + plain_enum_asserts(a, b); return ((int)a >= (int)b) ? (int)a : (int)b; } @@ -662,8 +666,7 @@ */ template <typename A, typename B> inline constexpr int min_size_prefer_dynamic(A a, B b) { - static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); - static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); + plain_enum_asserts(a, b); if ((int)a == 0 || (int)b == 0) return 0; if ((int)a == 1 || (int)b == 1) return 1; if ((int)a == Dynamic || (int)b == Dynamic) return Dynamic; @@ -678,8 +681,7 @@ */ template <typename A, typename B> inline constexpr int min_size_prefer_fixed(A a, B b) { - static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); - static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); + plain_enum_asserts(a, b); if ((int)a == 0 || (int)b == 0) return 0; if ((int)a == 1 || (int)b == 1) return 1; if ((int)a == Dynamic && (int)b == Dynamic) return Dynamic; @@ -691,12 +693,46 @@ /// \internal see `min_size_prefer_fixed`. No need for a separate variant for MaxSizes here. template <typename A, typename B> inline constexpr int max_size_prefer_dynamic(A a, B b) { - static_assert(is_int_or_enum_v<A>, "Argument a must be an integer or enum"); - static_assert(is_int_or_enum_v<B>, "Argument b must be an integer or enum"); + plain_enum_asserts(a, b); if ((int)a == Dynamic || (int)b == Dynamic) return Dynamic; return plain_enum_max(a, b); } +template <typename A, typename B> +inline constexpr bool enum_eq_not_dynamic(A a, B b) { + plain_enum_asserts(a, b); + if ((int)a == Dynamic || (int)b == Dynamic) return false; + return (int)a == (int)b; +} + +template <typename A, typename B> +inline constexpr bool enum_lt_not_dynamic(A a, B b) { + plain_enum_asserts(a, b); + if ((int)a == Dynamic || (int)b == Dynamic) return false; + return (int)a < (int)b; +} + +template <typename A, typename B> +inline constexpr bool enum_le_not_dynamic(A a, B b) { + plain_enum_asserts(a, b); + if ((int)a == Dynamic || (int)b == Dynamic) return false; + return (int)a <= (int)b; +} + +template <typename A, typename B> +inline constexpr bool enum_gt_not_dynamic(A a, B b) { + plain_enum_asserts(a, b); + if ((int)a == Dynamic || (int)b == Dynamic) return false; + return (int)a > (int)b; +} + +template <typename A, typename B> +inline constexpr bool enum_ge_not_dynamic(A a, B b) { + plain_enum_asserts(a, b); + if ((int)a == Dynamic || (int)b == Dynamic) return false; + return (int)a >= (int)b; +} + /// \internal Calculate logical XOR at compile time inline constexpr bool logical_xor(bool a, bool b) { return a != b; }
diff --git a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h index 74f2e6f..785cd4a 100644 --- a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h +++ b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
@@ -37,9 +37,7 @@ template <typename DerivativeType, typename OtherDerivativeType> struct maybe_coherent_pad_helper< DerivativeType, OtherDerivativeType, - std::enable_if_t<DerivativeType::SizeAtCompileTime >= OtherDerivativeType::SizeAtCompileTime && - DerivativeType::SizeAtCompileTime != Dynamic && - OtherDerivativeType::SizeAtCompileTime != Dynamic>> { + std::enable_if_t<enum_ge_not_dynamic(DerivativeType::SizeAtCompileTime, OtherDerivativeType::SizeAtCompileTime)>> { using type = const DerivativeType&; static const DerivativeType& pad(const DerivativeType& x, const OtherDerivativeType& /*y*/) { return x; } };