From: kronbichler Date: Fri, 28 Dec 2012 09:09:27 +0000 (+0000) Subject: Fix iterator types. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a29d0c8078e27a9429287be11df6bfb712eb2cef;p=dealii-svn.git Fix iterator types. git-svn-id: https://svn.dealii.org/trunk@27864 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/matrix_free/dof_info.templates.h b/deal.II/include/deal.II/matrix_free/dof_info.templates.h index a60093ecfa..d38900c3bf 100644 --- a/deal.II/include/deal.II/matrix_free/dof_info.templates.h +++ b/deal.II/include/deal.II/matrix_free/dof_info.templates.h @@ -72,7 +72,7 @@ namespace internal template ConstraintValues::ConstraintValues () : - constraints(FPArrayComparator(1.)) + constraints(FPArrayComparator(1.)) {} template @@ -110,8 +110,8 @@ namespace internal // lenghty and now we use a std::map with a // user-defined comparator to compare floating // point arrays to a tolerance 1e-13. - std::pair, unsigned int, - FPArrayComparator >::iterator, + std::pair, unsigned int, + FPArrayComparator >::iterator, bool> it = constraints.insert(next_constraint); unsigned int insert_position = deal_II_numbers::invalid_unsigned_int; if (it.second == false) diff --git a/deal.II/include/deal.II/matrix_free/mapping_info.templates.h b/deal.II/include/deal.II/matrix_free/mapping_info.templates.h index be7a70d403..493e39b124 100644 --- a/deal.II/include/deal.II/matrix_free/mapping_info.templates.h +++ b/deal.II/include/deal.II/matrix_free/mapping_info.templates.h @@ -604,8 +604,8 @@ end_set: { cartesian_data.resize(cartesians.size()); for (typename std::map, - unsigned int>::iterator it = cartesians.begin(); - it != cartesians.end(); ++it) + unsigned int, FPArrayComparator >::iterator + it = cartesians.begin(); it != cartesians.end(); ++it) { VectorizedArray det = make_vectorized_array(1.); for (unsigned int d=0; d, - unsigned int>::iterator it = affines.begin(); - it != affines.end(); ++it) + unsigned int, FPArrayComparator >::iterator + it = affines.begin(); it != affines.end(); ++it) { Tensor<2,dim,VectorizedArray > jac; for (unsigned int d=0; d::initialize_indices // set constraint pool from the std::map and // reorder the indices typename std::map, unsigned int, - internal::MatrixFreeFunctions::FPArrayComparator >::iterator + internal::MatrixFreeFunctions::FPArrayComparator >::iterator it = constraint_values.constraints.begin(), end = constraint_values.constraints.end(); std::vector*>