From: Bruno Turcksin Date: Tue, 16 Apr 2013 18:35:01 +0000 (+0000) Subject: Fix some conversion warnings. X-Git-Tag: v8.0.0~316^2~43 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c670a6d7a171f423b06906ade501c0b4b8104740;p=dealii.git Fix some conversion warnings. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29312 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index f08bd965a8..23d3f73791 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -2613,9 +2613,6 @@ namespace internal for (unsigned int d=0; d::vmult (BlockVector &dst, dst = 0.; - for (size_type row=0; row &dst, Assert (src.n_blocks() == n_block_cols(), ExcDimensionMismatch(src.n_blocks(), n_block_cols())); - for (size_type row=0; row inline MatrixBlock::MatrixBlock() : - row(deal_II_numbers::invalid_unsigned_int), - column(deal_II_numbers::invalid_unsigned_int) + row(deal_II_numbers::invalid_size_type), + column(deal_II_numbers::invalid_size_type) {} diff --git a/deal.II/include/deal.II/numerics/point_value_history.h b/deal.II/include/deal.II/numerics/point_value_history.h index 0e7877caf1..460d403c4b 100644 --- a/deal.II/include/deal.II/numerics/point_value_history.h +++ b/deal.II/include/deal.II/numerics/point_value_history.h @@ -62,10 +62,10 @@ namespace internal { public: PointGeometryData(const Point &new_requested_location, const std::vector > &new_locations, - const std::vector &new_sol_indices); + const std::vector &new_sol_indices); Point requested_location; std::vector > support_point_locations; - std::vector solution_indices; + std::vector solution_indices; }; } } diff --git a/deal.II/source/numerics/matrix_tools.cc b/deal.II/source/numerics/matrix_tools.cc index 4d95a80303..e20a1334c4 100644 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@ -1236,7 +1236,7 @@ namespace MatrixCreator #ifdef DEBUG if (true) { - types::global_dof_index max_element = 0; + types::global_dof_index max_element = static_cast(0); for (std::vector::const_iterator i=dof_to_boundary_mapping.begin(); i!=dof_to_boundary_mapping.end(); ++i) if ((*i != hp::DoFHandler::invalid_dof_index) && @@ -2177,7 +2177,7 @@ namespace MatrixTools // in the block in which this // dof is located const types::global_dof_index dof_number = dof->first; - const std::pair + const std::pair block_index = index_mapping.global_to_local (dof_number); // for each boundary dof: diff --git a/deal.II/source/numerics/point_value_history.cc b/deal.II/source/numerics/point_value_history.cc index 03859e48e1..a616907a0a 100644 --- a/deal.II/source/numerics/point_value_history.cc +++ b/deal.II/source/numerics/point_value_history.cc @@ -39,7 +39,7 @@ namespace internal PointGeometryData ::PointGeometryData (const Point &new_requested_location, const std::vector > &new_locations, - const std::vector &new_sol_indices) + const std::vector &new_sol_indices) { requested_location = new_requested_location; support_point_locations = new_locations; @@ -270,7 +270,7 @@ void PointValueHistory std::vector local_dof_indices (dof_handler->get_fe ().dofs_per_cell); - std::vector new_solution_indices; + std::vector new_solution_indices; current_cell->get_dof_indices (local_dof_indices); // there is an implicit assumption here // that all the closest support point to @@ -415,7 +415,7 @@ void PointValueHistory for (unsigned int point = 0; point < locations.size (); point++) { current_cell[point]->get_dof_indices (local_dof_indices); - std::vector new_solution_indices; + std::vector new_solution_indices; for (unsigned int component = 0; component < dof_handler->get_fe ().n_components (); component++) {