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 a60093ecfa7e894b3e2b7457e2ea0df4fc057e89..d38900c3bfc8bd85ece449df0a071005d2cdfa07 100644 (file)
--- 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 <typename Number>
     ConstraintValues<Number>::ConstraintValues ()
       :
-      constraints(FPArrayComparator<Number>(1.))
+      constraints(FPArrayComparator<double>(1.))
     {}
 
     template <typename Number>
@@ -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<typename std::map<std::vector<Number>, unsigned int,
-          FPArrayComparator<Number> >::iterator,
+      std::pair<typename std::map<std::vector<double>, unsigned int,
+          FPArrayComparator<double> >::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 be7a70d40325e312a067edcf09c93432343cf49b..493e39b124a12f669c34356225729e3bc31fb4d3 100644 (file)
--- 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<Tensor<1,dim,VEC_ARRAY>,
-                                     unsigned int>::iterator it = cartesians.begin();
-                   it != cartesians.end(); ++it)
+                     unsigned int, FPArrayComparator<Number> >::iterator
+                     it = cartesians.begin(); it != cartesians.end(); ++it)
                 {
                   VectorizedArray<Number> det = make_vectorized_array<Number>(1.);
                   for (unsigned int d=0; d<dim; ++d)
@@ -621,8 +621,8 @@ end_set:
                 }
               affine_data.resize(affines.size());
               for (typename std::map<Tensor<2,dim,VEC_ARRAY>,
-                                     unsigned int>::iterator it = affines.begin();
-                   it != affines.end(); ++it)
+                     unsigned int, FPArrayComparator<Number> >::iterator
+                     it = affines.begin(); it != affines.end(); ++it)
                 {
                   Tensor<2,dim,VectorizedArray<Number> > jac;
                   for (unsigned int d=0; d<dim; ++d)

diff --git a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
index c5e0d479e0a53b0d8973c5de940b63f1b553e2e8..b7b2b4c0d4a661191833f3792a0395d721c3851a 100644 (file)
--- a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
+++ b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
@@ -773,7 +773,7 @@ void MatrixFree<dim,Number>::initialize_indices
   // set constraint pool from the std::map and
   // reorder the indices
   typename std::map<std::vector<double>, unsigned int,
-           internal::MatrixFreeFunctions::FPArrayComparator<Number> >::iterator
+           internal::MatrixFreeFunctions::FPArrayComparator<double> >::iterator
            it = constraint_values.constraints.begin(),
            end = constraint_values.constraints.end();
   std::vector<const std::vector<double>*>