mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-30 17:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Using the suggested modification.

Browse Source
This commit is contained in:
Mehdi Goli 2018-08-01 16:04:44 +01:00
parent 3a197a60e6
commit af96018b49
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Eigen/src/Core/util/Macros.h
View File

@ -1077,26 +1077,15 @@ namespace Eigen {
#endif
#ifdef EIGEN_HAS_VARIADIC_TEMPLATES
// Provide a variadic version of assert which can take a parameter pack as its input
// The eigen_assert macro used here might have been redefined to use other macros such as EIGEN_THROW, such as used in Eigen's test suite, therefore this needs to be defined after the other macros.
// Note that this does not provide as nice a string to assert as a straight forward call to eigen_assert, so we add a message to the assert.
#if defined(EIGEN_NO_DEBUG)
#define eigen_variadic_assert(x)
#else
// The all function is used to enable a variadic version of eigen_assert which can take a parameter pack as its input.
namespace Eigen {
namespace internal {
inline void variadic_assert(const char*) {}
template<typename... Bools> inline void variadic_assert(const char* message, bool first, Bools ... others) {
eigen_assert(first && message);
variadic_assert(message, others...);
EIGEN_UNUSED_VARIABLE(first);
bool all(){ return true; }
template<typename T, typename ...Ts>
bool all(T t, Ts ... ts){ return t && all(ts...); }
}
}
}
#define EIGEN_VARIADIC_ASSERT_MESSAGE(x) EIGEN_MAKESTRING(x) " in " __FILE__ ":" EIGEN_MAKESTRING(__LINE__)
#define eigen_variadic_assert(x) \
do { Eigen::internal::variadic_assert(EIGEN_VARIADIC_ASSERT_MESSAGE(x), x); } while(false);
#endif
#endif

4
unsupported/Eigen/CXX11/src/Tensor/TensorMap.h
View File

@ -150,7 +150,7 @@ template<typename PlainObjectType, int Options_, template <class> class MakePoin
EIGEN_STRONG_INLINE const Scalar& operator()(Index firstIndex, Index secondIndex, IndexTypes... otherIndices) const
{
EIGEN_STATIC_ASSERT(sizeof...(otherIndices) + 2 == NumIndices, YOU_MADE_A_PROGRAMMING_MISTAKE)
eigen_variadic_assert((Eigen::NumTraits<Index>::highest() >= otherIndices)...);
eigen_assert(internal::all((Eigen::NumTraits<Index>::highest() >= otherIndices)...));
if (PlainObjectType::Options&RowMajor) {
const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumIndices>{{firstIndex, secondIndex, otherIndices...}});
return m_data[index];
@ -238,7 +238,7 @@ template<typename PlainObjectType, int Options_, template <class> class MakePoin
EIGEN_STRONG_INLINE Scalar& operator()(Index firstIndex, Index secondIndex, IndexTypes... otherIndices)
{
static_assert(sizeof...(otherIndices) + 2 == NumIndices || NumIndices == Dynamic, "Number of indices used to access a tensor coefficient must be equal to the rank of the tensor.");
eigen_variadic_assert((Eigen::NumTraits<Index>::highest() >= otherIndices)...);
eigen_assert(internal::all((Eigen::NumTraits<Index>::highest() >= otherIndices)...));
const std::size_t NumDims = sizeof...(otherIndices) + 2;
if (PlainObjectType::Options&RowMajor) {
const Index index = m_dimensions.IndexOfRowMajor(array<Index, NumDims>{{firstIndex, secondIndex, otherIndices...}});