diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h index 2d8c7b903..d3600eab3 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIndexList.h @@ -246,7 +246,7 @@ struct tuple_coeff { template EIGEN_DEVICE_FUNC static constexpr bool value_known_statically(const Index i, const IndexTuple& t) { - return ((i == Idx) & is_compile_time_constant::ValType>::value) || + return ((i == Idx) && is_compile_time_constant::ValType>::value) || tuple_coeff::value_known_statically(i, t); } @@ -468,7 +468,7 @@ struct index_statically_eq_impl { template struct index_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) == value); } }; @@ -476,7 +476,7 @@ struct index_statically_eq_impl > { template struct index_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) == value); } }; @@ -492,7 +492,7 @@ struct index_statically_ne_impl { template struct index_statically_ne_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) != value); } }; @@ -500,7 +500,7 @@ struct index_statically_ne_impl > { template struct index_statically_ne_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) != value); } }; @@ -516,7 +516,7 @@ struct index_statically_gt_impl { template struct index_statically_gt_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) > value); } }; @@ -524,7 +524,7 @@ struct index_statically_gt_impl > { template struct index_statically_gt_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) > value); } }; @@ -541,7 +541,7 @@ struct index_statically_lt_impl { template struct index_statically_lt_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) < value); } }; @@ -549,7 +549,7 @@ struct index_statically_lt_impl > { template struct index_statically_lt_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexList().value_known_statically(i) & + return IndexList().value_known_statically(i) && (IndexList().get(i) < value); } }; @@ -566,7 +566,7 @@ struct index_pair_first_statically_eq_impl { template struct index_pair_first_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexPairList().value_known_statically(i) & + return IndexPairList().value_known_statically(i) && (IndexPairList().operator[](i).first == value); } }; @@ -574,7 +574,7 @@ struct index_pair_first_statically_eq_impl struct index_pair_first_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexPairList().value_known_statically(i) & + return IndexPairList().value_known_statically(i) && (IndexPairList().operator[](i).first == value); } }; @@ -591,7 +591,7 @@ struct index_pair_second_statically_eq_impl { template struct index_pair_second_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexPairList().value_known_statically(i) & + return IndexPairList().value_known_statically(i) && (IndexPairList().operator[](i).second == value); } }; @@ -599,7 +599,7 @@ struct index_pair_second_statically_eq_impl struct index_pair_second_statically_eq_impl > { EIGEN_DEVICE_FUNC static constexpr bool run(const Index i, const Index value) { - return IndexPairList().value_known_statically(i) & + return IndexPairList().value_known_statically(i) && (IndexPairList().operator[](i).second == value); } };