Fix clang-21 warnings (Project-OSRM#7303)

MarcelloPerathoner · web-flow · commit 64726e77b770 · 2026-01-09T23:04:46.000+01:00
diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp
@@ -28,7 +28,7 @@ namespace osrm::engine::api
 class TableAPI final : public BaseAPI
 {
   public:
-    virtual ~TableAPI() = default;
+    ~TableAPI() = default;
 
     struct TableCellRef
     {
@@ -44,11 +44,10 @@ class TableAPI final : public BaseAPI
     {
     }
 
-    virtual void
-    MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
-                 const std::vector<PhantomNodeCandidates> &candidates,
-                 const std::vector<TableCellRef> &fallback_speed_cells,
-                 osrm::engine::api::ResultT &response) const
+    void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
+                      const std::vector<PhantomNodeCandidates> &candidates,
+                      const std::vector<TableCellRef> &fallback_speed_cells,
+                      osrm::engine::api::ResultT &response) const
     {
         if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
         {
@@ -62,11 +61,10 @@ class TableAPI final : public BaseAPI
         }
     }
 
-    virtual void
-    MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
-                 const std::vector<PhantomNodeCandidates> &candidates,
-                 const std::vector<TableCellRef> &fallback_speed_cells,
-                 flatbuffers::FlatBufferBuilder &fb_result) const
+    void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
+                      const std::vector<PhantomNodeCandidates> &candidates,
+                      const std::vector<TableCellRef> &fallback_speed_cells,
+                      flatbuffers::FlatBufferBuilder &fb_result) const
     {
         auto number_of_sources = parameters.sources.size();
         auto number_of_destinations = parameters.destinations.size();
@@ -165,11 +163,10 @@ class TableAPI final : public BaseAPI
         fb_result.Finish(response.Finish());
     }
 
-    virtual void
-    MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
-                 const std::vector<PhantomNodeCandidates> &candidates,
-                 const std::vector<TableCellRef> &fallback_speed_cells,
-                 util::json::Object &response) const
+    void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
+                      const std::vector<PhantomNodeCandidates> &candidates,
+                      const std::vector<TableCellRef> &fallback_speed_cells,
+                      util::json::Object &response) const
     {
         auto number_of_sources = parameters.sources.size();
         auto number_of_destinations = parameters.destinations.size();
@@ -238,7 +235,7 @@ class TableAPI final : public BaseAPI
     }
 
   protected:
-    virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
     MakeWaypoints(flatbuffers::FlatBufferBuilder &builder,
                   const std::vector<PhantomNodeCandidates> &candidates) const
     {
@@ -253,7 +250,7 @@ class TableAPI final : public BaseAPI
         return builder.CreateVector(waypoints);
     }
 
-    virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>
     MakeWaypoints(flatbuffers::FlatBufferBuilder &builder,
                   const std::vector<PhantomNodeCandidates> &candidates,
                   const std::vector<std::size_t> &indices) const
@@ -271,7 +268,7 @@ class TableAPI final : public BaseAPI
         return builder.CreateVector(waypoints);
     }
 
-    virtual flatbuffers::Offset<flatbuffers::Vector<float>>
+    flatbuffers::Offset<flatbuffers::Vector<float>>
     MakeDurationTable(flatbuffers::FlatBufferBuilder &builder,
                       const std::vector<EdgeDuration> &values) const
     {
@@ -291,7 +288,7 @@ class TableAPI final : public BaseAPI
         return builder.CreateVector(distance_table);
     }
 
-    virtual flatbuffers::Offset<flatbuffers::Vector<float>>
+    flatbuffers::Offset<flatbuffers::Vector<float>>
     MakeDistanceTable(flatbuffers::FlatBufferBuilder &builder,
                       const std::vector<EdgeDistance> &values) const
     {
@@ -311,7 +308,7 @@ class TableAPI final : public BaseAPI
         return builder.CreateVector(duration_table);
     }
 
-    virtual flatbuffers::Offset<flatbuffers::Vector<uint32_t>>
+    flatbuffers::Offset<flatbuffers::Vector<uint32_t>>
     MakeEstimatesTable(flatbuffers::FlatBufferBuilder &builder,
                        const std::vector<TableCellRef> &fallback_speed_cells) const
     {
@@ -327,8 +324,7 @@ class TableAPI final : public BaseAPI
         return builder.CreateVector(fb_table);
     }
 
-    virtual util::json::Array
-    MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates) const
+    util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates) const
     {
         util::json::Array json_waypoints;
         json_waypoints.values.reserve(candidates.size());
@@ -341,8 +337,8 @@ class TableAPI final : public BaseAPI
         return json_waypoints;
     }
 
-    virtual util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates,
-                                            const std::vector<std::size_t> &indices) const
+    util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates,
+                                    const std::vector<std::size_t> &indices) const
     {
         util::json::Array json_waypoints;
         json_waypoints.values.reserve(indices.size());
@@ -356,9 +352,9 @@ class TableAPI final : public BaseAPI
         return json_waypoints;
     }
 
-    virtual util::json::Array MakeDurationTable(const std::vector<EdgeDuration> &values,
-                                                std::size_t number_of_rows,
-                                                std::size_t number_of_columns) const
+    util::json::Array MakeDurationTable(const std::vector<EdgeDuration> &values,
+                                        std::size_t number_of_rows,
+                                        std::size_t number_of_columns) const
     {
         util::json::Array json_table;
         for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
@@ -386,9 +382,9 @@ class TableAPI final : public BaseAPI
         return json_table;
     }
 
-    virtual util::json::Array MakeDistanceTable(const std::vector<EdgeDistance> &values,
-                                                std::size_t number_of_rows,
-                                                std::size_t number_of_columns) const
+    util::json::Array MakeDistanceTable(const std::vector<EdgeDistance> &values,
+                                        std::size_t number_of_rows,
+                                        std::size_t number_of_columns) const
     {
         util::json::Array json_table;
         for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
@@ -415,7 +411,7 @@ class TableAPI final : public BaseAPI
         return json_table;
     }
 
-    virtual util::json::Array
+    util::json::Array
     MakeEstimatesTable(const std::vector<TableCellRef> &fallback_speed_cells) const
     {
         util::json::Array json_table;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace osrm::engine::api`
`28`	`28`	`class TableAPI final : public BaseAPI`
`29`	`29`	`{`
`30`	`30`	`public:`
`31`		`- virtual ~TableAPI() = default;`
	`31`	`+ ~TableAPI() = default;`
`32`	`32`
`33`	`33`	`struct TableCellRef`
`34`	`34`	`{`
`@@ -44,11 +44,10 @@ class TableAPI final : public BaseAPI`
`44`	`44`	`{`
`45`	`45`	`}`
`46`	`46`
`47`		`- virtual void`
`48`		`- MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
`49`		`- const std::vector<PhantomNodeCandidates> &candidates,`
`50`		`- const std::vector<TableCellRef> &fallback_speed_cells,`
`51`		`- osrm::engine::api::ResultT &response) const`
	`47`	`+ void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
	`48`	`+ const std::vector<PhantomNodeCandidates> &candidates,`
	`49`	`+ const std::vector<TableCellRef> &fallback_speed_cells,`
	`50`	`+ osrm::engine::api::ResultT &response) const`
`52`	`51`	`{`
`53`	`52`	`if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))`
`54`	`53`	`{`
`@@ -62,11 +61,10 @@ class TableAPI final : public BaseAPI`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`
`65`		`- virtual void`
`66`		`- MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
`67`		`- const std::vector<PhantomNodeCandidates> &candidates,`
`68`		`- const std::vector<TableCellRef> &fallback_speed_cells,`
`69`		`- flatbuffers::FlatBufferBuilder &fb_result) const`
	`64`	`+ void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
	`65`	`+ const std::vector<PhantomNodeCandidates> &candidates,`
	`66`	`+ const std::vector<TableCellRef> &fallback_speed_cells,`
	`67`	`+ flatbuffers::FlatBufferBuilder &fb_result) const`
`70`	`68`	`{`
`71`	`69`	`auto number_of_sources = parameters.sources.size();`
`72`	`70`	`auto number_of_destinations = parameters.destinations.size();`
`@@ -165,11 +163,10 @@ class TableAPI final : public BaseAPI`
`165`	`163`	`fb_result.Finish(response.Finish());`
`166`	`164`	`}`
`167`	`165`
`168`		`- virtual void`
`169`		`- MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
`170`		`- const std::vector<PhantomNodeCandidates> &candidates,`
`171`		`- const std::vector<TableCellRef> &fallback_speed_cells,`
`172`		`- util::json::Object &response) const`
	`166`	`+ void MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,`
	`167`	`+ const std::vector<PhantomNodeCandidates> &candidates,`
	`168`	`+ const std::vector<TableCellRef> &fallback_speed_cells,`
	`169`	`+ util::json::Object &response) const`
`173`	`170`	`{`
`174`	`171`	`auto number_of_sources = parameters.sources.size();`
`175`	`172`	`auto number_of_destinations = parameters.destinations.size();`
`@@ -238,7 +235,7 @@ class TableAPI final : public BaseAPI`
`238`	`235`	`}`
`239`	`236`
`240`	`237`	`protected:`
`241`		`- virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>`
	`238`	`+ flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>`
`242`	`239`	`MakeWaypoints(flatbuffers::FlatBufferBuilder &builder,`
`243`	`240`	`const std::vector<PhantomNodeCandidates> &candidates) const`
`244`	`241`	`{`
`@@ -253,7 +250,7 @@ class TableAPI final : public BaseAPI`
`253`	`250`	`return builder.CreateVector(waypoints);`
`254`	`251`	`}`
`255`	`252`
`256`		`- virtual flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>`
	`253`	`+ flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<fbresult::Waypoint>>>`
`257`	`254`	`MakeWaypoints(flatbuffers::FlatBufferBuilder &builder,`
`258`	`255`	`const std::vector<PhantomNodeCandidates> &candidates,`
`259`	`256`	`const std::vector<std::size_t> &indices) const`
`@@ -271,7 +268,7 @@ class TableAPI final : public BaseAPI`
`271`	`268`	`return builder.CreateVector(waypoints);`
`272`	`269`	`}`
`273`	`270`
`274`		`- virtual flatbuffers::Offset<flatbuffers::Vector<float>>`
	`271`	`+ flatbuffers::Offset<flatbuffers::Vector<float>>`
`275`	`272`	`MakeDurationTable(flatbuffers::FlatBufferBuilder &builder,`
`276`	`273`	`const std::vector<EdgeDuration> &values) const`
`277`	`274`	`{`
`@@ -291,7 +288,7 @@ class TableAPI final : public BaseAPI`
`291`	`288`	`return builder.CreateVector(distance_table);`
`292`	`289`	`}`
`293`	`290`
`294`		`- virtual flatbuffers::Offset<flatbuffers::Vector<float>>`
	`291`	`+ flatbuffers::Offset<flatbuffers::Vector<float>>`
`295`	`292`	`MakeDistanceTable(flatbuffers::FlatBufferBuilder &builder,`
`296`	`293`	`const std::vector<EdgeDistance> &values) const`
`297`	`294`	`{`
`@@ -311,7 +308,7 @@ class TableAPI final : public BaseAPI`
`311`	`308`	`return builder.CreateVector(duration_table);`
`312`	`309`	`}`
`313`	`310`
`314`		`- virtual flatbuffers::Offset<flatbuffers::Vector<uint32_t>>`
	`311`	`+ flatbuffers::Offset<flatbuffers::Vector<uint32_t>>`
`315`	`312`	`MakeEstimatesTable(flatbuffers::FlatBufferBuilder &builder,`
`316`	`313`	`const std::vector<TableCellRef> &fallback_speed_cells) const`
`317`	`314`	`{`
`@@ -327,8 +324,7 @@ class TableAPI final : public BaseAPI`
`327`	`324`	`return builder.CreateVector(fb_table);`
`328`	`325`	`}`
`329`	`326`
`330`		`- virtual util::json::Array`
`331`		`- MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates) const`
	`327`	`+ util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates) const`
`332`	`328`	`{`
`333`	`329`	`util::json::Array json_waypoints;`
`334`	`330`	`json_waypoints.values.reserve(candidates.size());`
`@@ -341,8 +337,8 @@ class TableAPI final : public BaseAPI`
`341`	`337`	`return json_waypoints;`
`342`	`338`	`}`
`343`	`339`
`344`		`- virtual util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates,`
`345`		`- const std::vector<std::size_t> &indices) const`
	`340`	`+ util::json::Array MakeWaypoints(const std::vector<PhantomNodeCandidates> &candidates,`
	`341`	`+ const std::vector<std::size_t> &indices) const`
`346`	`342`	`{`
`347`	`343`	`util::json::Array json_waypoints;`
`348`	`344`	`json_waypoints.values.reserve(indices.size());`
`@@ -356,9 +352,9 @@ class TableAPI final : public BaseAPI`
`356`	`352`	`return json_waypoints;`
`357`	`353`	`}`
`358`	`354`
`359`		`- virtual util::json::Array MakeDurationTable(const std::vector<EdgeDuration> &values,`
`360`		`- std::size_t number_of_rows,`
`361`		`- std::size_t number_of_columns) const`
	`355`	`+ util::json::Array MakeDurationTable(const std::vector<EdgeDuration> &values,`
	`356`	`+ std::size_t number_of_rows,`
	`357`	`+ std::size_t number_of_columns) const`
`362`	`358`	`{`
`363`	`359`	`util::json::Array json_table;`
`364`	`360`	`for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))`
`@@ -386,9 +382,9 @@ class TableAPI final : public BaseAPI`
`386`	`382`	`return json_table;`
`387`	`383`	`}`
`388`	`384`
`389`		`- virtual util::json::Array MakeDistanceTable(const std::vector<EdgeDistance> &values,`
`390`		`- std::size_t number_of_rows,`
`391`		`- std::size_t number_of_columns) const`
	`385`	`+ util::json::Array MakeDistanceTable(const std::vector<EdgeDistance> &values,`
	`386`	`+ std::size_t number_of_rows,`
	`387`	`+ std::size_t number_of_columns) const`
`392`	`388`	`{`
`393`	`389`	`util::json::Array json_table;`
`394`	`390`	`for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))`
`@@ -415,7 +411,7 @@ class TableAPI final : public BaseAPI`
`415`	`411`	`return json_table;`
`416`	`412`	`}`
`417`	`413`
`418`		`- virtual util::json::Array`
	`414`	`+ util::json::Array`
`419`	`415`	`MakeEstimatesTable(const std::vector<TableCellRef> &fallback_speed_cells) const`
`420`	`416`	`{`
`421`	`417`	`util::json::Array json_table;`