]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make it compile with MIPSpro.
authorhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Mar 2004 12:14:23 +0000 (12:14 +0000)
committerhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Mar 2004 12:14:23 +0000 (12:14 +0000)
git-svn-id: https://svn.dealii.org/trunk@8798 0785d39b-7218-0410-832d-ea1e28bc413d

tests/deal.II/filtered_iterator.cc

index b423575a107d32fb0aaf7dc0d4e2b1608dc33d7a..5752d149a33360f6829519a567d54551f3d886be 100644 (file)
@@ -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<active_cell_iterator>;
       FilteredIterator<active_cell_iterator>
-       begin (&level_equal_to_3<active_cell_iterator>,
-              tria.begin_active (3)),
-       end   (&level_equal_to_3<active_cell_iterator>,
-              tria.end());
+       begin (predicate, tria.begin_active (3)),
+       end   (predicate, tria.end());
       
       Assert (std::distance (begin, end) ==
              static_cast<signed int>(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<active_cell_iterator>;
       FilteredIterator<active_cell_iterator>
-       begin (std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 3),
+       begin (std::bind2nd (std::ptr_fun(predicate), 3),
               tria.begin_active (3)),
-       end   (std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 3),
+       end   (std::bind2nd (std::ptr_fun(predicate), 3),
               tria.end());
       
       Assert (std::distance (begin, end) ==
@@ -156,13 +158,17 @@ void test ()
     {
       typedef FilteredIterator<active_cell_iterator> FI;
             
-      Assert (std::distance (FI(std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 3)).set_to_next_positive(tria.begin_active()),
-                            FI(std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 3), tria.end())) ==
+      bool (*predicate) (const active_cell_iterator, const unsigned int)
+       = &level_equal_to<active_cell_iterator>;
+      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<signed int>(tria.n_active_cells (3)),
              ExcInternalError());
       logfile << "Check 4: "
-             << (std::distance (FI(std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 3)).set_to_next_positive(tria.begin_active()),
-                                FI(std::bind2nd (std::ptr_fun(&level_equal_to<active_cell_iterator>), 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<signed int>(tria.n_active_cells (3))
                  ?
                  "OK" : "Failed")

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.