From: Wolfgang Bangerth Date: Tue, 6 Apr 2010 14:42:10 +0000 (+0000) Subject: Simplify code and make it acceptable to gcc 4.5. X-Git-Tag: v8.0.0~6231 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ab99f7f792899adbd00f76439bc9b45284c489;p=dealii.git Simplify code and make it acceptable to gcc 4.5. git-svn-id: https://svn.dealii.org/trunk@20949 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc index 613749c1e2..216a28eb21 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_block.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_block.cc @@ -30,6 +30,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -473,7 +474,7 @@ void MGTransferBlockSelect::build_matrices ( for (unsigned int i=0; i (temp_copy_indices[i], i); + std::pair (temp_copy_indices[i], i); Assert (counter == n_active_dofs, ExcInternalError()); } } @@ -554,7 +555,7 @@ void MGTransferBlock::build_matrices ( for (unsigned int i=0; i + std::pair (temp_copy_indices[block][i], i); Assert (counter == n_active_dofs, ExcInternalError()); } diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc index 0fbeacf72e..81b650dff2 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc @@ -666,7 +666,7 @@ void MGTransferSelect::build_matrices ( for (unsigned int i=0; i (temp_copy_indices[i], i); + std::pair (temp_copy_indices[i], i); Assert (counter == n_active_dofs, ExcInternalError()); } } diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc index 4e3f023973..abcf291e51 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_prebuilt.cc @@ -386,7 +386,7 @@ void MGTransferPrebuilt::build_matrices ( for (unsigned int i=0; i (temp_copy_indices[i], i); + std::pair (temp_copy_indices[i], i); Assert (counter == n_active_dofs, ExcInternalError()); } }