Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Bump flatbuffers to v24.3.25 version

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-06-22 18:52:02 +02:00
parent 7793ae47d3
commit 24c0ce7029
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generated/include/engine/api/flatbuffers/fbresult.fbs
View File

@ -14,7 +14,7 @@ table FBResult {
data_version: string; data_version: string;
waypoints: [Waypoint]; //Used as 'sources' waypoints for a 'Table' service waypoints: [Waypoint]; //Used as 'sources' waypoints for a 'Table' service
routes: [RouteObject]; routes: [RouteObject];
table: Table; table: TableResult;
} }
root_type FBResult; root_type FBResult;

10
generated/include/engine/api/flatbuffers/fbresult_generated.h
View File

@ -117,8 +117,8 @@ struct FBResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes() const { const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes() const {
return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *>(VT_ROUTES); return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *>(VT_ROUTES);
} }
const osrm::engine::api::fbresult::Table *table() const { const osrm::engine::api::fbresult::TableResult *table() const {
return GetPointer<const osrm::engine::api::fbresult::Table *>(VT_TABLE); return GetPointer<const osrm::engine::api::fbresult::TableResult *>(VT_TABLE);
} }
bool Verify(::flatbuffers::Verifier &verifier) const { bool Verify(::flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
@ -158,7 +158,7 @@ struct FBResultBuilder {
void add_routes(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes) { void add_routes(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes) {
fbb_.AddOffset(FBResult::VT_ROUTES, routes); fbb_.AddOffset(FBResult::VT_ROUTES, routes);
} }
void add_table(::flatbuffers::Offset<osrm::engine::api::fbresult::Table> table) { void add_table(::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table) {
fbb_.AddOffset(FBResult::VT_TABLE, table); fbb_.AddOffset(FBResult::VT_TABLE, table);
} }
explicit FBResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb) explicit FBResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
@ -179,7 +179,7 @@ inline ::flatbuffers::Offset<FBResult> CreateFBResult(
::flatbuffers::Offset<::flatbuffers::String> data_version = 0, ::flatbuffers::Offset<::flatbuffers::String> data_version = 0,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> waypoints = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> waypoints = 0,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes = 0,
::flatbuffers::Offset<osrm::engine::api::fbresult::Table> table = 0) { ::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table = 0) {
FBResultBuilder builder_(_fbb); FBResultBuilder builder_(_fbb);
builder_.add_table(table); builder_.add_table(table);
builder_.add_routes(routes); builder_.add_routes(routes);
@ -197,7 +197,7 @@ inline ::flatbuffers::Offset<FBResult> CreateFBResultDirect(
const char *data_version = nullptr, const char *data_version = nullptr,
const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *waypoints = nullptr, const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *waypoints = nullptr,
const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes = nullptr, const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes = nullptr,
::flatbuffers::Offset<osrm::engine::api::fbresult::Table> table = 0) { ::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table = 0) {
auto data_version__ = data_version ? _fbb.CreateString(data_version) : 0; auto data_version__ = data_version ? _fbb.CreateString(data_version) : 0;
auto waypoints__ = waypoints ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*waypoints) : 0; auto waypoints__ = waypoints ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*waypoints) : 0;
auto routes__ = routes ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>(*routes) : 0; auto routes__ = routes ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>(*routes) : 0;

2
generated/include/engine/api/flatbuffers/table.fbs
View File

@ -1,7 +1,7 @@
include "waypoint.fbs"; include "waypoint.fbs";
namespace osrm.engine.api.fbresult; namespace osrm.engine.api.fbresult;
table Table { table TableResult {
durations: [float]; durations: [float];
rows: ushort; rows: ushort;
cols: ushort; cols: ushort;

38
generated/include/engine/api/flatbuffers/table_generated.h
View File

@ -20,11 +20,11 @@ namespace engine {
namespace api { namespace api {
namespace fbresult { namespace fbresult {
struct Table; struct TableResult;
struct TableBuilder; struct TableResultBuilder;
struct Table FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { struct TableResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
typedef TableBuilder Builder; typedef TableResultBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
VT_DURATIONS = 4, VT_DURATIONS = 4,
VT_ROWS = 6, VT_ROWS = 6,
@ -68,40 +68,40 @@ struct Table FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
} }
}; };
struct TableBuilder { struct TableResultBuilder {
typedef Table Table; typedef TableResult Table;
::flatbuffers::FlatBufferBuilder &fbb_; ::flatbuffers::FlatBufferBuilder &fbb_;
::flatbuffers::uoffset_t start_; ::flatbuffers::uoffset_t start_;
void add_durations(::flatbuffers::Offset<::flatbuffers::Vector<float>> durations) { void add_durations(::flatbuffers::Offset<::flatbuffers::Vector<float>> durations) {
fbb_.AddOffset(Table::VT_DURATIONS, durations); fbb_.AddOffset(TableResult::VT_DURATIONS, durations);
} }
void add_rows(uint16_t rows) { void add_rows(uint16_t rows) {
fbb_.AddElement<uint16_t>(Table::VT_ROWS, rows, 0); fbb_.AddElement<uint16_t>(TableResult::VT_ROWS, rows, 0);
} }
void add_cols(uint16_t cols) { void add_cols(uint16_t cols) {
fbb_.AddElement<uint16_t>(Table::VT_COLS, cols, 0); fbb_.AddElement<uint16_t>(TableResult::VT_COLS, cols, 0);
} }
void add_distances(::flatbuffers::Offset<::flatbuffers::Vector<float>> distances) { void add_distances(::flatbuffers::Offset<::flatbuffers::Vector<float>> distances) {
fbb_.AddOffset(Table::VT_DISTANCES, distances); fbb_.AddOffset(TableResult::VT_DISTANCES, distances);
} }
void add_destinations(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations) { void add_destinations(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations) {
fbb_.AddOffset(Table::VT_DESTINATIONS, destinations); fbb_.AddOffset(TableResult::VT_DESTINATIONS, destinations);
} }
void add_fallback_speed_cells(::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> fallback_speed_cells) { void add_fallback_speed_cells(::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> 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) { : fbb_(_fbb) {
start_ = fbb_.StartTable(); start_ = fbb_.StartTable();
} }
::flatbuffers::Offset<Table> Finish() { ::flatbuffers::Offset<TableResult> Finish() {
const auto end = fbb_.EndTable(start_); const auto end = fbb_.EndTable(start_);
auto o = ::flatbuffers::Offset<Table>(end); auto o = ::flatbuffers::Offset<TableResult>(end);
return o; return o;
} }
}; };
inline ::flatbuffers::Offset<Table> CreateTable( inline ::flatbuffers::Offset<TableResult> CreateTableResult(
::flatbuffers::FlatBufferBuilder &_fbb, ::flatbuffers::FlatBufferBuilder &_fbb,
::flatbuffers::Offset<::flatbuffers::Vector<float>> durations = 0, ::flatbuffers::Offset<::flatbuffers::Vector<float>> durations = 0,
uint16_t rows = 0, uint16_t rows = 0,
@ -109,7 +109,7 @@ inline ::flatbuffers::Offset<Table> CreateTable(
::flatbuffers::Offset<::flatbuffers::Vector<float>> distances = 0, ::flatbuffers::Offset<::flatbuffers::Vector<float>> distances = 0,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations = 0,
::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> fallback_speed_cells = 0) { ::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> fallback_speed_cells = 0) {
TableBuilder builder_(_fbb); TableResultBuilder builder_(_fbb);
builder_.add_fallback_speed_cells(fallback_speed_cells); builder_.add_fallback_speed_cells(fallback_speed_cells);
builder_.add_destinations(destinations); builder_.add_destinations(destinations);
builder_.add_distances(distances); builder_.add_distances(distances);
@ -119,7 +119,7 @@ inline ::flatbuffers::Offset<Table> CreateTable(
return builder_.Finish(); return builder_.Finish();
} }
inline ::flatbuffers::Offset<Table> CreateTableDirect( inline ::flatbuffers::Offset<TableResult> CreateTableResultDirect(
::flatbuffers::FlatBufferBuilder &_fbb, ::flatbuffers::FlatBufferBuilder &_fbb,
const std::vector<float> *durations = nullptr, const std::vector<float> *durations = nullptr,
uint16_t rows = 0, uint16_t rows = 0,
@ -131,7 +131,7 @@ inline ::flatbuffers::Offset<Table> CreateTableDirect(
auto distances__ = distances ? _fbb.CreateVector<float>(*distances) : 0; auto distances__ = distances ? _fbb.CreateVector<float>(*distances) : 0;
auto destinations__ = destinations ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*destinations) : 0; auto destinations__ = destinations ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*destinations) : 0;
auto fallback_speed_cells__ = fallback_speed_cells ? _fbb.CreateVector<uint32_t>(*fallback_speed_cells) : 0; auto fallback_speed_cells__ = fallback_speed_cells ? _fbb.CreateVector<uint32_t>(*fallback_speed_cells) : 0;
return osrm::engine::api::fbresult::CreateTable( return osrm::engine::api::fbresult::CreateTableResult(
_fbb, _fbb,
durations__, durations__,
rows, rows,

2
include/engine/api/table_api.hpp
View File

@ -137,7 +137,7 @@ class TableAPI final : public BaseAPI
speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells); speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells);
} }
fbresult::TableBuilder table(fb_result); fbresult::TableResultBuilder table(fb_result);
table.add_destinations(destinations); table.add_destinations(destinations);
table.add_rows(number_of_sources); table.add_rows(number_of_sources);
table.add_cols(number_of_destinations); table.add_cols(number_of_destinations);