From: Wolfgang Bangerth Date: Fri, 14 Sep 2007 19:03:05 +0000 (+0000) Subject: Qualify a number of calls for broken STLs X-Git-Tag: v8.0.0~9841 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a1363761f9c30a47d6b8db62803e09fbe59658f;p=dealii.git Qualify a number of calls for broken STLs git-svn-id: https://svn.dealii.org/trunk@15217 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 6dc414d7ed..886d0cbb4e 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -1203,7 +1203,7 @@ DoFRenumbering::compute_downstream_dg ( typename DH::active_cell_iterator end = dof.end(); copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); std::vector reverse(new_indices.size()); compute_cell_wise_dg(new_indices, reverse, dof, ordered_cells); @@ -1226,7 +1226,7 @@ DoFRenumbering::compute_downstream_dg ( typename DH::active_cell_iterator end = dof.end(); copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); compute_cell_wise_dg(new_indices, reverse, dof, ordered_cells); } @@ -1248,7 +1248,7 @@ DoFRenumbering::compute_downstream ( typename DH::active_cell_iterator end = dof.end(); copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); compute_cell_wise(new_indices, reverse, dof, ordered_cells); } @@ -1296,8 +1296,8 @@ DoFRenumbering::compute_downstream_dg ( typename MGDoFHandler::cell_iterator begin = dof.begin(level); typename MGDoFHandler::cell_iterator end = dof.end(level); - copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::copy (begin, end, ordered_cells.begin()); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); compute_cell_wise_dg(new_indices, reverse, dof, level, ordered_cells); } @@ -1319,8 +1319,8 @@ DoFRenumbering::compute_downstream ( typename MGDoFHandler::cell_iterator begin = dof.begin(level); typename MGDoFHandler::cell_iterator end = dof.end(level); - copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::copy (begin, end, ordered_cells.begin()); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); compute_cell_wise(new_indices, reverse, dof, level, ordered_cells); } @@ -1397,8 +1397,8 @@ DoFRenumbering::compute_clockwise_dg ( typename DH::active_cell_iterator begin = dof.begin_active(); typename DH::active_cell_iterator end = dof.end(); - copy (begin, end, ordered_cells.begin()); - sort (ordered_cells.begin(), ordered_cells.end(), comparator); + std::copy (begin, end, ordered_cells.begin()); + std::sort (ordered_cells.begin(), ordered_cells.end(), comparator); std::vector reverse(new_indices.size()); compute_cell_wise_dg(new_indices, reverse, dof, ordered_cells); diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index c2477412dc..5a5be56fab 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -332,8 +332,8 @@ namespace internal //Assigns the correct sides to //each quads - transform(inquads.begin(),inquads.end(), std::back_inserter(mquads), - std::bind2nd(MQuad::MakeQuad(),sides) ); + std::transform(inquads.begin(),inquads.end(), std::back_inserter(mquads), + std::bind2nd(MQuad::MakeQuad(),sides) ); // Assign the quads to their sides also. int qctr = 0;