From 5c6688aff794bf38d76eb621d04b22de7eb5bd1c Mon Sep 17 00:00:00 2001 From: Giovanni Alzetta Date: Mon, 25 Feb 2019 12:40:27 +0100 Subject: [PATCH] Guess point owner uses std::move to return tuple --- source/grid/grid_tools.cc | 13 +++---------- ...t_owner_1.cc => grid_tools_guess_pt_owner_01.cc} | 0 ...1.output => grid_tools_guess_pt_owner_01.output} | 0 3 files changed, 3 insertions(+), 10 deletions(-) rename tests/grid/{grid_tools_guess_pt_owner_1.cc => grid_tools_guess_pt_owner_01.cc} (100%) rename tests/grid/{grid_tools_guess_pt_owner_1.output => grid_tools_guess_pt_owner_01.output} (100%) 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::map, - std::map>> - 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 -- 2.39.5