Guess point owner uses std::move to return tuple

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 58d12d3a94fca95bb4d214afa9f941cc1a79435a..44d49753d1661040521dd2e23e78e528c7fb3e14 100644 (file)
--- 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