Explicitely convert an arg to the vector<unsigned int> constructor to avoid that...

git-svn-id: https://svn.dealii.org/trunk@4791 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc
index cd2c125821ac5a3c72e6431708450b86933a4ae2..6bcbee64053f7ea31412e5722366b22aee716a02 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_dgq.cc
+++ b/deal.II/deal.II/source/fe/fe_dgq.cc
@@ -252,7 +252,7 @@ template <int dim>
 std::vector<unsigned int>
 FE_DGQ<dim>::get_dpo_vector(unsigned int deg)
 {
-  std::vector<unsigned int> dpo(dim+1, 0);
+  std::vector<unsigned int> dpo(dim+1, static_cast<unsigned int>(0));
   dpo[dim] = ++deg;
   for (unsigned int i=1;i<dim;++i)
     dpo[dim] *= deg;

diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc
index bb2f61d398edfb309ed6b87f00e352286644aade..2014f91d776cc66bb6b8b5fd0fc5835554bf22d1 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_values.cc
+++ b/deal.II/deal.II/source/fe/fe_values.cc
@@ -141,7 +141,7 @@ void FEValuesBase<dim>::get_function_values (const InputVector            &fe_fu
     present_cell->get_interpolated_dof_values(fe_function, dof_values);
 
                                   // initialize with zero
-  fill_n (values.begin(), n_quadrature_points, 0);
+  std::fill_n (values.begin(), n_quadrature_points, 0);
 
                                   // add up contributions of trial
                                   // functions
@@ -265,7 +265,7 @@ get_function_grads (const InputVector                    &fe_function,
     present_cell->get_interpolated_dof_values(fe_function, dof_values);
 
                                   // initialize with zero
-  fill_n (gradients.begin(), n_quadrature_points, Tensor<1,dim>());
+  std::fill_n (gradients.begin(), n_quadrature_points, Tensor<1,dim>());
 
                                   // add up contributions of trial
                                   // functions
@@ -306,7 +306,7 @@ get_function_grads (const InputVector
 
                                   // initialize with zero
   for (unsigned i=0;i<gradients.size();++i)
-    fill_n (gradients[i].begin(), gradients[i].size(), Tensor<1,dim>());
+    std::fill_n (gradients[i].begin(), gradients[i].size(), Tensor<1,dim>());
 
                                   // add up contributions of trial
                                   // functions
@@ -387,7 +387,7 @@ get_function_2nd_derivatives (const InputVector
 
                                   // initialize with zero
   for (unsigned i=0;i<second_derivs.size();++i)
-    fill_n (second_derivs[i].begin(), second_derivs[i].size(), Tensor<2,dim>());
+    std::fill_n (second_derivs[i].begin(), second_derivs[i].size(), Tensor<2,dim>());
 
                                   // add up contributions of trial
                                   // functions

diff --git a/deal.II/deal.II/source/fe/mapping_c1.cc b/deal.II/deal.II/source/fe/mapping_c1.cc
index cc20ddb6f3833e6d46fb323579cb6fa47d39e9aa..797d0fe3c049b417911b5f2fbdd2e8b905fe4af0 100644 (file)
--- a/deal.II/deal.II/source/fe/mapping_c1.cc
+++ b/deal.II/deal.II/source/fe/mapping_c1.cc
@@ -142,14 +142,14 @@ MappingC1<2>::add_line_support_points (const Triangulation<2>::cell_iterator &ce
          coordinate_axis /= h;
 
          const double alpha = std::atan2(coordinate_axis[1], coordinate_axis[0]);
-         const double b = ((face_vertex_normals[0][1] * sin(alpha)
-                            +face_vertex_normals[0][0] * cos(alpha)) /
-                           (face_vertex_normals[0][1] * cos(alpha)
-                            -face_vertex_normals[0][0] * sin(alpha))),
-                      c = ((face_vertex_normals[1][1] * sin(alpha)
-                            +face_vertex_normals[1][0] * cos(alpha)) /
-                           (face_vertex_normals[1][1] * cos(alpha)
-                            -face_vertex_normals[1][0] * sin(alpha)));
+         const double b = ((face_vertex_normals[0][1] * std::sin(alpha)
+                            +face_vertex_normals[0][0] * std::cos(alpha)) /
+                           (face_vertex_normals[0][1] * std::cos(alpha)
+                            -face_vertex_normals[0][0] * std::sin(alpha))),
+                      c = ((face_vertex_normals[1][1] * std::sin(alpha)
+                            +face_vertex_normals[1][0] * std::cos(alpha)) /
+                           (face_vertex_normals[1][1] * std::cos(alpha)
+                            -face_vertex_normals[1][0] * std::sin(alpha)));
 
                                           // next evaluate the so
                                           // determined cubic

diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc
index e992094f51f464db652e66d1aa3a7d8d1b2c3108..78873e17391d04f9618b5b5ccb8548daaa3f2945 100644 (file)
--- a/deal.II/deal.II/source/fe/mapping_q1.cc
+++ b/deal.II/deal.II/source/fe/mapping_q1.cc
@@ -679,8 +679,8 @@ MappingQ1<dim>::compute_fill_face (const typename DoFHandler<dim>::cell_iterator
                          | update_JxW_values))
        for (unsigned int i=0;i<boundary_forms.size();++i)
          {
-           double f = sqrt(contract(boundary_forms[i],
-                                    boundary_forms[i]));
+           double f = std::sqrt(contract(boundary_forms[i],
+                                         boundary_forms[i]));
            if (update_flags & update_JxW_values)
              {
                JxW_values[i] = f * weights[i];