From 2ddd2174253058494037936915a936148fd60f49 Mon Sep 17 00:00:00 2001 From: whytro Date: Tue, 21 Mar 2023 23:24:37 +0900 Subject: [PATCH] Remove redundant moves --- include/engine/plugins/match.hpp | 4 ++-- include/engine/plugins/nearest.hpp | 2 +- include/engine/plugins/plugin_base.hpp | 2 +- include/engine/plugins/table.hpp | 2 +- include/engine/plugins/trip.hpp | 2 +- src/engine/plugins/nearest.cpp | 4 ++-- src/engine/plugins/table.cpp | 4 ++-- src/engine/plugins/viaroute.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp index 79dc0b834..e59366414 100644 --- a/include/engine/plugins/match.hpp +++ b/include/engine/plugins/match.hpp @@ -22,8 +22,8 @@ class MatchPlugin : public BasePlugin MatchPlugin(const int max_locations_map_matching, const double max_radius_map_matching, - boost::optional default_radius) - : BasePlugin(std::move(default_radius)), + const boost::optional default_radius) + : BasePlugin(default_radius), max_locations_map_matching(max_locations_map_matching), max_radius_map_matching(max_radius_map_matching) { diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp index 7e9fa22ff..415639b2c 100644 --- a/include/engine/plugins/nearest.hpp +++ b/include/engine/plugins/nearest.hpp @@ -13,7 +13,7 @@ namespace osrm::engine::plugins class NearestPlugin final : public BasePlugin { public: - explicit NearestPlugin(const int max_results, boost::optional default_radius); + explicit NearestPlugin(const int max_results, const boost::optional default_radius); Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, const api::NearestParameters ¶ms, diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp index 4012d07ab..849c779e8 100644 --- a/include/engine/plugins/plugin_base.hpp +++ b/include/engine/plugins/plugin_base.hpp @@ -29,7 +29,7 @@ class BasePlugin protected: BasePlugin() = default; - BasePlugin(boost::optional default_radius_) : default_radius(std::move(default_radius_)) + BasePlugin(const boost::optional default_radius_) : default_radius(default_radius_) { } diff --git a/include/engine/plugins/table.hpp b/include/engine/plugins/table.hpp index 4c427df79..e4cf9a33c 100644 --- a/include/engine/plugins/table.hpp +++ b/include/engine/plugins/table.hpp @@ -15,7 +15,7 @@ class TablePlugin final : public BasePlugin { public: explicit TablePlugin(const int max_locations_distance_table, - boost::optional default_radius); + const boost::optional default_radius); Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, const api::TableParameters ¶ms, diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp index 1a69e01e3..9cfdab094 100644 --- a/include/engine/plugins/trip.hpp +++ b/include/engine/plugins/trip.hpp @@ -33,7 +33,7 @@ class TripPlugin final : public BasePlugin public: explicit TripPlugin(const int max_locations_trip_, boost::optional default_radius) - : BasePlugin(std::move(default_radius)), max_locations_trip(max_locations_trip_) + : BasePlugin(default_radius), max_locations_trip(max_locations_trip_) { } diff --git a/src/engine/plugins/nearest.cpp b/src/engine/plugins/nearest.cpp index c0db57a4d..671dbe3f2 100644 --- a/src/engine/plugins/nearest.cpp +++ b/src/engine/plugins/nearest.cpp @@ -10,8 +10,8 @@ namespace osrm::engine::plugins { -NearestPlugin::NearestPlugin(const int max_results_, boost::optional default_radius_) - : BasePlugin(std::move(default_radius_)), max_results{max_results_} +NearestPlugin::NearestPlugin(const int max_results_, const boost::optional default_radius_) + : BasePlugin(default_radius_), max_results{max_results_} { } diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp index 0d7535b15..4cb307b24 100644 --- a/src/engine/plugins/table.cpp +++ b/src/engine/plugins/table.cpp @@ -15,8 +15,8 @@ namespace osrm::engine::plugins { TablePlugin::TablePlugin(const int max_locations_distance_table, - boost::optional default_radius) - : BasePlugin(std::move(default_radius)), + const boost::optional default_radius) + : BasePlugin(default_radius), max_locations_distance_table(max_locations_distance_table) { } diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp index db1686332..fe0727936 100644 --- a/src/engine/plugins/viaroute.cpp +++ b/src/engine/plugins/viaroute.cpp @@ -18,7 +18,7 @@ namespace osrm::engine::plugins ViaRoutePlugin::ViaRoutePlugin(int max_locations_viaroute, int max_alternatives, boost::optional default_radius) - : BasePlugin(std::move(default_radius)), max_locations_viaroute(max_locations_viaroute), + : BasePlugin(default_radius), max_locations_viaroute(max_locations_viaroute), max_alternatives(max_alternatives) { }