From 24c0ce702917b905bb550945c3dece4a6ff7d539 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 22 Jun 2024 18:52:02 +0200 Subject: [PATCH] Bump flatbuffers to v24.3.25 version --- .../engine/api/flatbuffers/fbresult.fbs | 2 +- .../api/flatbuffers/fbresult_generated.h | 10 ++--- .../include/engine/api/flatbuffers/table.fbs | 2 +- .../engine/api/flatbuffers/table_generated.h | 38 +++++++++---------- include/engine/api/table_api.hpp | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/generated/include/engine/api/flatbuffers/fbresult.fbs b/generated/include/engine/api/flatbuffers/fbresult.fbs index a587899a3..860f46248 100644 --- a/generated/include/engine/api/flatbuffers/fbresult.fbs +++ b/generated/include/engine/api/flatbuffers/fbresult.fbs @@ -14,7 +14,7 @@ table FBResult { data_version: string; waypoints: [Waypoint]; //Used as 'sources' waypoints for a 'Table' service routes: [RouteObject]; - table: Table; + table: TableResult; } root_type FBResult; \ No newline at end of file diff --git a/generated/include/engine/api/flatbuffers/fbresult_generated.h b/generated/include/engine/api/flatbuffers/fbresult_generated.h index cb038c957..0f0129819 100644 --- a/generated/include/engine/api/flatbuffers/fbresult_generated.h +++ b/generated/include/engine/api/flatbuffers/fbresult_generated.h @@ -117,8 +117,8 @@ struct FBResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { const ::flatbuffers::Vector<::flatbuffers::Offset> *routes() const { return GetPointer> *>(VT_ROUTES); } - const osrm::engine::api::fbresult::Table *table() const { - return GetPointer(VT_TABLE); + const osrm::engine::api::fbresult::TableResult *table() const { + return GetPointer(VT_TABLE); } bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -158,7 +158,7 @@ struct FBResultBuilder { void add_routes(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> routes) { fbb_.AddOffset(FBResult::VT_ROUTES, routes); } - void add_table(::flatbuffers::Offset table) { + void add_table(::flatbuffers::Offset table) { fbb_.AddOffset(FBResult::VT_TABLE, table); } explicit FBResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb) @@ -179,7 +179,7 @@ inline ::flatbuffers::Offset CreateFBResult( ::flatbuffers::Offset<::flatbuffers::String> data_version = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> waypoints = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> routes = 0, - ::flatbuffers::Offset table = 0) { + ::flatbuffers::Offset table = 0) { FBResultBuilder builder_(_fbb); builder_.add_table(table); builder_.add_routes(routes); @@ -197,7 +197,7 @@ inline ::flatbuffers::Offset CreateFBResultDirect( const char *data_version = nullptr, const std::vector<::flatbuffers::Offset> *waypoints = nullptr, const std::vector<::flatbuffers::Offset> *routes = nullptr, - ::flatbuffers::Offset table = 0) { + ::flatbuffers::Offset table = 0) { auto data_version__ = data_version ? _fbb.CreateString(data_version) : 0; auto waypoints__ = waypoints ? _fbb.CreateVector<::flatbuffers::Offset>(*waypoints) : 0; auto routes__ = routes ? _fbb.CreateVector<::flatbuffers::Offset>(*routes) : 0; diff --git a/generated/include/engine/api/flatbuffers/table.fbs b/generated/include/engine/api/flatbuffers/table.fbs index caf1855e6..0cbd947bc 100644 --- a/generated/include/engine/api/flatbuffers/table.fbs +++ b/generated/include/engine/api/flatbuffers/table.fbs @@ -1,7 +1,7 @@ include "waypoint.fbs"; namespace osrm.engine.api.fbresult; -table Table { +table TableResult { durations: [float]; rows: ushort; cols: ushort; diff --git a/generated/include/engine/api/flatbuffers/table_generated.h b/generated/include/engine/api/flatbuffers/table_generated.h index 3294b5b95..30c6bd81c 100644 --- a/generated/include/engine/api/flatbuffers/table_generated.h +++ b/generated/include/engine/api/flatbuffers/table_generated.h @@ -20,11 +20,11 @@ namespace engine { namespace api { namespace fbresult { -struct Table; -struct TableBuilder; +struct TableResult; +struct TableResultBuilder; -struct Table FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { - typedef TableBuilder Builder; +struct TableResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { + typedef TableResultBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_DURATIONS = 4, VT_ROWS = 6, @@ -68,40 +68,40 @@ struct Table FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { } }; -struct TableBuilder { - typedef Table Table; +struct TableResultBuilder { + typedef TableResult Table; ::flatbuffers::FlatBufferBuilder &fbb_; ::flatbuffers::uoffset_t start_; void add_durations(::flatbuffers::Offset<::flatbuffers::Vector> durations) { - fbb_.AddOffset(Table::VT_DURATIONS, durations); + fbb_.AddOffset(TableResult::VT_DURATIONS, durations); } void add_rows(uint16_t rows) { - fbb_.AddElement(Table::VT_ROWS, rows, 0); + fbb_.AddElement(TableResult::VT_ROWS, rows, 0); } void add_cols(uint16_t cols) { - fbb_.AddElement(Table::VT_COLS, cols, 0); + fbb_.AddElement(TableResult::VT_COLS, cols, 0); } void add_distances(::flatbuffers::Offset<::flatbuffers::Vector> distances) { - fbb_.AddOffset(Table::VT_DISTANCES, distances); + fbb_.AddOffset(TableResult::VT_DISTANCES, distances); } void add_destinations(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> destinations) { - fbb_.AddOffset(Table::VT_DESTINATIONS, destinations); + fbb_.AddOffset(TableResult::VT_DESTINATIONS, destinations); } void add_fallback_speed_cells(::flatbuffers::Offset<::flatbuffers::Vector> fallback_speed_cells) { - fbb_.AddOffset(Table::VT_FALLBACK_SPEED_CELLS, fallback_speed_cells); + fbb_.AddOffset(TableResult::VT_FALLBACK_SPEED_CELLS, fallback_speed_cells); } - explicit TableBuilder(::flatbuffers::FlatBufferBuilder &_fbb) + explicit TableResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - ::flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = ::flatbuffers::Offset
(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline ::flatbuffers::Offset
CreateTable( +inline ::flatbuffers::Offset CreateTableResult( ::flatbuffers::FlatBufferBuilder &_fbb, ::flatbuffers::Offset<::flatbuffers::Vector> durations = 0, uint16_t rows = 0, @@ -109,7 +109,7 @@ inline ::flatbuffers::Offset
CreateTable( ::flatbuffers::Offset<::flatbuffers::Vector> distances = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> destinations = 0, ::flatbuffers::Offset<::flatbuffers::Vector> fallback_speed_cells = 0) { - TableBuilder builder_(_fbb); + TableResultBuilder builder_(_fbb); builder_.add_fallback_speed_cells(fallback_speed_cells); builder_.add_destinations(destinations); builder_.add_distances(distances); @@ -119,7 +119,7 @@ inline ::flatbuffers::Offset
CreateTable( return builder_.Finish(); } -inline ::flatbuffers::Offset
CreateTableDirect( +inline ::flatbuffers::Offset CreateTableResultDirect( ::flatbuffers::FlatBufferBuilder &_fbb, const std::vector *durations = nullptr, uint16_t rows = 0, @@ -131,7 +131,7 @@ inline ::flatbuffers::Offset
CreateTableDirect( auto distances__ = distances ? _fbb.CreateVector(*distances) : 0; auto destinations__ = destinations ? _fbb.CreateVector<::flatbuffers::Offset>(*destinations) : 0; auto fallback_speed_cells__ = fallback_speed_cells ? _fbb.CreateVector(*fallback_speed_cells) : 0; - return osrm::engine::api::fbresult::CreateTable( + return osrm::engine::api::fbresult::CreateTableResult( _fbb, durations__, rows, diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp index 82bfe4e38..2ba49d2dd 100644 --- a/include/engine/api/table_api.hpp +++ b/include/engine/api/table_api.hpp @@ -137,7 +137,7 @@ class TableAPI final : public BaseAPI speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells); } - fbresult::TableBuilder table(fb_result); + fbresult::TableResultBuilder table(fb_result); table.add_destinations(destinations); table.add_rows(number_of_sources); table.add_cols(number_of_destinations);