From 41fafae21d3c846a0f76c6f3491acc02d582af69 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 13 Oct 2014 17:29:53 +0200 Subject: [PATCH] mark Plugin classes as final --- Plugins/DistanceTablePlugin.h | 2 +- Plugins/HelloWorldPlugin.h | 2 +- Plugins/LocatePlugin.h | 2 +- Plugins/NearestPlugin.h | 8 ++++---- Plugins/TimestampPlugin.h | 2 +- Plugins/ViaRoutePlugin.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Plugins/DistanceTablePlugin.h b/Plugins/DistanceTablePlugin.h index 35e491aad..c4c189902 100644 --- a/Plugins/DistanceTablePlugin.h +++ b/Plugins/DistanceTablePlugin.h @@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -template class DistanceTablePlugin : public BasePlugin +template class DistanceTablePlugin final : public BasePlugin { private: std::shared_ptr> search_engine_ptr; diff --git a/Plugins/HelloWorldPlugin.h b/Plugins/HelloWorldPlugin.h index cd73e43b8..d9b4a8d0e 100644 --- a/Plugins/HelloWorldPlugin.h +++ b/Plugins/HelloWorldPlugin.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -class HelloWorldPlugin : public BasePlugin +class HelloWorldPlugin final : public BasePlugin { private: std::string temp_string; diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h index 29f32a163..1701bbe15 100644 --- a/Plugins/LocatePlugin.h +++ b/Plugins/LocatePlugin.h @@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include // locates the nearest node in the road network for a given coordinate. -template class LocatePlugin : public BasePlugin +template class LocatePlugin final : public BasePlugin { public: explicit LocatePlugin(DataFacadeT *facade) : descriptor_string("locate"), facade(facade) {} diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index 71f99188c..b8b4092a7 100644 --- a/Plugins/NearestPlugin.h +++ b/Plugins/NearestPlugin.h @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * This Plugin locates the nearest point on a street in the road network for a given coordinate. */ -template class NearestPlugin : public BasePlugin +template class NearestPlugin final : public BasePlugin { public: explicit NearestPlugin(DataFacadeT *facade) : facade(facade), descriptor_string("nearest") {} @@ -59,7 +59,7 @@ template class NearestPlugin : public BasePlugin phantom_node_vector, route_parameters.zoom_level, number_of_results); - + JSON::Object json_result; if (phantom_node_vector.empty() || !phantom_node_vector.front().isValid()) { @@ -69,11 +69,11 @@ template class NearestPlugin : public BasePlugin { reply.status = http::Reply::ok; json_result.values["status"] = 0; - + if (number_of_results > 1) { JSON::Array results; - + int vector_length = phantom_node_vector.size(); for (const auto i : osrm::irange(0, std::min(number_of_results, vector_length))) { diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h index e1bae06f4..0047db199 100644 --- a/Plugins/TimestampPlugin.h +++ b/Plugins/TimestampPlugin.h @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -template class TimestampPlugin : public BasePlugin +template class TimestampPlugin final : public BasePlugin { public: explicit TimestampPlugin(const DataFacadeT *facade) diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h index 158e5cae5..cffb121cf 100644 --- a/Plugins/ViaRoutePlugin.h +++ b/Plugins/ViaRoutePlugin.h @@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -template class ViaRoutePlugin : public BasePlugin +template class ViaRoutePlugin final : public BasePlugin { private: std::unordered_map descriptor_table;