]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid explicit template arguments in std::make_pair 8455/head
authorDaniel Arndt <arndtd@ornl.gov>
Mon, 5 Aug 2019 14:23:08 +0000 (10:23 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Mon, 5 Aug 2019 14:23:38 +0000 (10:23 -0400)
include/deal.II/fe/fe_system.h
source/particles/particle_handler.cc

index 9b59fba0a52014752be91d08772076012078e905..dbbc0dfb639500fe2b18e0b9176cf7d66c0f98b6 100644 (file)
@@ -1263,8 +1263,7 @@ namespace internal
     std::pair<std::unique_ptr<FiniteElement<dim, spacedim>>, unsigned int>
     promote_to_fe_pair(const FiniteElement<dim, spacedim> &fe)
     {
-      return std::make_pair<std::unique_ptr<FiniteElement<dim, spacedim>>,
-                            unsigned int>(std::move(fe.clone()), 1u);
+      return std::make_pair(std::move(fe.clone()), 1u);
     }
 
 
index b4c041378ba90d6911dd89d9591ad1ac674c34c6..98a9f046fa1fc9711c4999a907e1d8c25e480fa2 100644 (file)
@@ -234,7 +234,7 @@ namespace Particles
     const typename Triangulation<dim, spacedim>::active_cell_iterator &cell)
   {
     const internal::LevelInd level_index =
-      std::make_pair<int, int>(cell->level(), cell->index());
+      std::make_pair(cell->level(), cell->index());
 
     if (cell->is_ghost())
       {
@@ -410,7 +410,7 @@ namespace Particles
     const
   {
     const internal::LevelInd found_cell =
-      std::make_pair<int, int>(cell->level(), cell->index());
+      std::make_pair(cell->level(), cell->index());
 
     if (cell->is_locally_owned())
       return particles.count(found_cell);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.