From 2014c7ae28c592063f6887632682231ed862cfc5 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Sat, 15 Sep 2018 14:35:10 +0200 Subject: Move all, last, end from Eigen::placeholders namespace to Eigen::, and rename end to lastp1 to avoid conflicts with std::end. --- test/symbolic_index.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'test/symbolic_index.cpp') diff --git a/test/symbolic_index.cpp b/test/symbolic_index.cpp index 02db2eb51..bccf1b884 100644 --- a/test/symbolic_index.cpp +++ b/test/symbolic_index.cpp @@ -54,7 +54,6 @@ is_same_type(const T1&, const T2&) template bool is_same_symb(const T1& a, const T2& b, Index size) { - using Eigen::placeholders::last; return a.eval(last=size-1) == b.eval(last=size-1); } @@ -72,14 +71,11 @@ void check_isnot_symbolic(const T&) { void check_symbolic_index() { - using Eigen::placeholders::last; - using Eigen::placeholders::end; - check_is_symbolic(last); - check_is_symbolic(end); + check_is_symbolic(lastp1); check_is_symbolic(last+1); - check_is_symbolic(last-end); - check_is_symbolic(2*last-end/2); + check_is_symbolic(last-lastp1); + check_is_symbolic(2*last-lastp1/2); check_isnot_symbolic(fix<3>()); Index size=100; @@ -93,14 +89,14 @@ void check_symbolic_index() VERIFY( is_same_type( fix<9>()|fix<2>(), fix<9|2>() ) ); VERIFY( is_same_type( fix<9>()/2, int(9/2) ) ); - VERIFY( is_same_symb( end-1, last, size) ); - VERIFY( is_same_symb( end-fix<1>, last, size) ); + VERIFY( is_same_symb( lastp1-1, last, size) ); + VERIFY( is_same_symb( lastp1-fix<1>, last, size) ); VERIFY_IS_EQUAL( ( (last*5-2)/3 ).eval(last=size-1), ((size-1)*5-2)/3 ); VERIFY_IS_EQUAL( ( (last*fix<5>-fix<2>)/fix<3> ).eval(last=size-1), ((size-1)*5-2)/3 ); - VERIFY_IS_EQUAL( ( -last*end ).eval(last=size-1), -(size-1)*size ); - VERIFY_IS_EQUAL( ( end-3*last ).eval(last=size-1), size- 3*(size-1) ); - VERIFY_IS_EQUAL( ( (end-3*last)/end ).eval(last=size-1), (size- 3*(size-1))/size ); + VERIFY_IS_EQUAL( ( -last*lastp1 ).eval(last=size-1), -(size-1)*size ); + VERIFY_IS_EQUAL( ( lastp1-3*last ).eval(last=size-1), size- 3*(size-1) ); + VERIFY_IS_EQUAL( ( (lastp1-3*last)/lastp1 ).eval(last=size-1), (size- 3*(size-1))/size ); #if EIGEN_HAS_CXX14 { -- cgit v1.2.3