From: Giovanni Alzetta <giovannialzetta@hotmail.it>
Date: Mon, 25 Feb 2019 11:40:27 +0000 (+0100)
Subject: Guess point owner uses std::move to return tuple
X-Git-Tag: v9.1.0-rc1~322^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6688aff794bf38d76eb621d04b22de7eb5bd1c;p=dealii.git

Guess point owner uses std::move to return tuple
---

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 58d12d3a94..44d49753d1 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -2091,16 +2091,9 @@ namespace GridTools
           map_owners_guessed[pt] = owners_found;
       }
 
-    std::tuple<std::vector<std::vector<unsigned int>>,
-               std::map<unsigned int, unsigned int>,
-               std::map<unsigned int, std::vector<unsigned int>>>
-      output_tuple;
-
-    std::get<0>(output_tuple) = point_owners;
-    std::get<1>(output_tuple) = map_owners_found;
-    std::get<2>(output_tuple) = map_owners_guessed;
-
-    return output_tuple;
+    return std::make_tuple(std::move(point_owners),
+                           std::move(map_owners_found),
+                           std::move(map_owners_guessed));
   }
 
 
diff --git a/tests/grid/grid_tools_guess_pt_owner_1.cc b/tests/grid/grid_tools_guess_pt_owner_01.cc
similarity index 100%
rename from tests/grid/grid_tools_guess_pt_owner_1.cc
rename to tests/grid/grid_tools_guess_pt_owner_01.cc
diff --git a/tests/grid/grid_tools_guess_pt_owner_1.output b/tests/grid/grid_tools_guess_pt_owner_01.output
similarity index 100%
rename from tests/grid/grid_tools_guess_pt_owner_1.output
rename to tests/grid/grid_tools_guess_pt_owner_01.output