From: hartmann Date: Wed, 17 Mar 2004 12:14:23 +0000 (+0000) Subject: Make it compile with MIPSpro. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab2dfd6eb994c93f4d1a8bc838c4f81abe5e4be;p=dealii-svn.git Make it compile with MIPSpro. git-svn-id: https://svn.dealii.org/trunk@8798 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/filtered_iterator.cc b/tests/deal.II/filtered_iterator.cc index b423575a10..5752d149a3 100644 --- a/tests/deal.II/filtered_iterator.cc +++ b/tests/deal.II/filtered_iterator.cc @@ -110,11 +110,11 @@ void test () // on some level in a different way if (true) { + bool (*predicate) (const active_cell_iterator) + = &level_equal_to_3; FilteredIterator - begin (&level_equal_to_3, - tria.begin_active (3)), - end (&level_equal_to_3, - tria.end()); + begin (predicate, tria.begin_active (3)), + end (predicate, tria.end()); Assert (std::distance (begin, end) == static_cast(tria.n_active_cells (3)), @@ -133,10 +133,12 @@ void test () // way if (true) { + bool (*predicate) (const active_cell_iterator, const unsigned int) + = &level_equal_to; FilteredIterator - begin (std::bind2nd (std::ptr_fun(&level_equal_to), 3), + begin (std::bind2nd (std::ptr_fun(predicate), 3), tria.begin_active (3)), - end (std::bind2nd (std::ptr_fun(&level_equal_to), 3), + end (std::bind2nd (std::ptr_fun(predicate), 3), tria.end()); Assert (std::distance (begin, end) == @@ -156,13 +158,17 @@ void test () { typedef FilteredIterator FI; - Assert (std::distance (FI(std::bind2nd (std::ptr_fun(&level_equal_to), 3)).set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(&level_equal_to), 3), tria.end())) == + bool (*predicate) (const active_cell_iterator, const unsigned int) + = &level_equal_to; + Assert (std::distance (FI(std::bind2nd (std::ptr_fun(predicate), 3)) + .set_to_next_positive(tria.begin_active()), + FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std::bind2nd (std::ptr_fun(&level_equal_to), 3)).set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(&level_equal_to), 3), tria.end())) == + << (std::distance (FI(std::bind2nd (std::ptr_fun(predicate), 3)) + .set_to_next_positive(tria.begin_active()), + FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed")