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 613749c1e2030cdc6b321b3ddf177a6fa1c01c29..216a28eb2136bc8c15434eed638c5d9d831bd00e 100644 (file)
--- 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 <algorithm>
 #include <numeric>
 #include <iostream>
+#include <utility>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -473,7 +474,7 @@ void MGTransferBlockSelect<number>::build_matrices (
       for (unsigned int i=0; i<temp_copy_indices.size(); ++i)
        if (temp_copy_indices[i] != numbers::invalid_unsigned_int)
          copy_indices[selected_block][level][counter++] =
-           std::make_pair<unsigned int,unsigned int> (temp_copy_indices[i], i);
+           std::pair<unsigned int, unsigned int> (temp_copy_indices[i], i);
       Assert (counter == n_active_dofs, ExcInternalError());
     }
 }
@@ -554,7 +555,7 @@ void MGTransferBlock<number>::build_matrices (
            for (unsigned int i=0; i<temp_copy_indices[block].size(); ++i)
              if (temp_copy_indices[block][i] != numbers::invalid_unsigned_int)
                copy_indices[block][level][counter++] =
-                 std::make_pair<unsigned int,unsigned int>
+                 std::pair<unsigned int, unsigned int>
                  (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 0fbeacf72e7c604935ea34fbc7588eb5df9bf579..81b650dff28aa377b5df1c0c4b7afd5497ca5836 100644 (file)
--- 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<number>::build_matrices (
       for (unsigned int i=0; i<temp_copy_indices.size(); ++i)
        if (temp_copy_indices[i] != numbers::invalid_unsigned_int)
          copy_to_and_from_indices[level][counter++] =
-           std::make_pair<unsigned int,unsigned int> (temp_copy_indices[i], i);
+           std::pair<unsigned int, unsigned int> (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 4e3f023973457113512b7d5d98df284bff168da9..abcf291e51c7db493033b09fdb0485e15914ac1a 100644 (file)
--- 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<VECTOR>::build_matrices (
       for (unsigned int i=0; i<temp_copy_indices.size(); ++i)
        if (temp_copy_indices[i] != numbers::invalid_unsigned_int)
          copy_indices[level][counter++] =
-           std::make_pair<unsigned int,unsigned int> (temp_copy_indices[i], i);
+           std::pair<unsigned int, unsigned int> (temp_copy_indices[i], i);
       Assert (counter == n_active_dofs, ExcInternalError());
     }
 }