Move all, last, end from Eigen::placeholders namespace to Eigen::, and rename end to lastp1 to avoid conflicts with std::end.

This commit is contained in:
Gael Guennebaud
2018-09-15 14:35:10 +02:00
parent 8e2be7777e
commit 2014c7ae28
4 changed files with 23 additions and 43 deletions

View File

@@ -329,9 +329,9 @@ seq(const symbolic::BaseExpr<FirstTypeDerived> &f, const symbolic::BaseExpr<Last
* \sa lastN(SizeType), seqN(FirstType,SizeType), seq(FirstType,LastType,IncrType) */
template<typename SizeType,typename IncrType>
auto lastN(SizeType size, IncrType incr)
-> decltype(seqN(Eigen::placeholders::last-(size-fix<1>())*incr, size, incr))
-> decltype(seqN(Eigen::last-(size-fix<1>())*incr, size, incr))
{
return seqN(Eigen::placeholders::last-(size-fix<1>())*incr, size, incr);
return seqN(Eigen::last-(size-fix<1>())*incr, size, incr);
}
/** \cpp11
@@ -342,9 +342,9 @@ auto lastN(SizeType size, IncrType incr)
* \sa lastN(SizeType,IncrType, seqN(FirstType,SizeType), seq(FirstType,LastType) */
template<typename SizeType>
auto lastN(SizeType size)
-> decltype(seqN(Eigen::placeholders::last+fix<1>()-size, size))
-> decltype(seqN(Eigen::last+fix<1>()-size, size))
{
return seqN(Eigen::placeholders::last+fix<1>()-size, size);
return seqN(Eigen::last+fix<1>()-size, size);
}
#endif