Skip to content

Commit cfc5aa0

Browse files
FlatBuffers Contributorsdbaileychess
authored andcommitted
Project import generated by Copybara.
PiperOrigin-RevId: 846693978
1 parent fb55e0c commit cfc5aa0

File tree

106 files changed

+24135
-15841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+24135
-15841
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ set(FlatBuffers_Tests_SRCS
240240
tests/native_type_test_impl.cpp
241241
tests/alignment_test.h
242242
tests/alignment_test.cpp
243+
tests/default_vectors_test.h
244+
tests/default_vectors_test.cpp
243245
tests/64bit/offset64_test.h
244246
tests/64bit/offset64_test.cpp
245247
include/flatbuffers/code_generators.h

goldens/cpp/basic_generated.h

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// automatically generated by the FlatBuffers compiler, do not modify
22

3-
43
#ifndef FLATBUFFERS_GENERATED_BASIC_FLATBUFFERS_GOLDENS_H_
54
#define FLATBUFFERS_GENERATED_BASIC_FLATBUFFERS_GOLDENS_H_
65

@@ -9,9 +8,9 @@
98
// Ensure the included flatbuffers.h is the same version as when this file was
109
// generated, otherwise it may not be compatible.
1110
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
12-
FLATBUFFERS_VERSION_MINOR == 9 &&
13-
FLATBUFFERS_VERSION_REVISION == 23,
14-
"Non-compatible flatbuffers version included");
11+
FLATBUFFERS_VERSION_MINOR == 9 &&
12+
FLATBUFFERS_VERSION_REVISION == 23,
13+
"Non-compatible flatbuffers version included");
1514

1615
namespace flatbuffers {
1716
namespace goldens {
@@ -27,11 +26,9 @@ struct Galaxy FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
2726
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
2827
VT_NUM_STARS = 4
2928
};
30-
int64_t num_stars() const {
31-
return GetField<int64_t>(VT_NUM_STARS, 0);
32-
}
29+
int64_t num_stars() const { return GetField<int64_t>(VT_NUM_STARS, 0); }
3330
template <bool B = false>
34-
bool Verify(::flatbuffers::VerifierTemplate<B> &verifier) const {
31+
bool Verify(::flatbuffers::VerifierTemplate<B>& verifier) const {
3532
return VerifyTableStart(verifier) &&
3633
VerifyField<int64_t>(verifier, VT_NUM_STARS, 8) &&
3734
verifier.EndTable();
@@ -40,13 +37,12 @@ struct Galaxy FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
4037

4138
struct GalaxyBuilder {
4239
typedef Galaxy Table;
43-
::flatbuffers::FlatBufferBuilder &fbb_;
40+
::flatbuffers::FlatBufferBuilder& fbb_;
4441
::flatbuffers::uoffset_t start_;
4542
void add_num_stars(int64_t num_stars) {
4643
fbb_.AddElement<int64_t>(Galaxy::VT_NUM_STARS, num_stars, 0);
4744
}
48-
explicit GalaxyBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
49-
: fbb_(_fbb) {
45+
explicit GalaxyBuilder(::flatbuffers::FlatBufferBuilder& _fbb) : fbb_(_fbb) {
5046
start_ = fbb_.StartTable();
5147
}
5248
::flatbuffers::Offset<Galaxy> Finish() {
@@ -57,8 +53,7 @@ struct GalaxyBuilder {
5753
};
5854

5955
inline ::flatbuffers::Offset<Galaxy> CreateGalaxy(
60-
::flatbuffers::FlatBufferBuilder &_fbb,
61-
int64_t num_stars = 0) {
56+
::flatbuffers::FlatBufferBuilder& _fbb, int64_t num_stars = 0) {
6257
GalaxyBuilder builder_(_fbb);
6358
builder_.add_num_stars(num_stars);
6459
return builder_.Finish();
@@ -70,35 +65,37 @@ struct Universe FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
7065
VT_AGE = 4,
7166
VT_GALAXIES = 6
7267
};
73-
double age() const {
74-
return GetField<double>(VT_AGE, 0.0);
75-
}
76-
const ::flatbuffers::Vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>> *galaxies() const {
77-
return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>> *>(VT_GALAXIES);
68+
double age() const { return GetField<double>(VT_AGE, 0.0); }
69+
const ::flatbuffers::Vector<
70+
::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>*
71+
galaxies() const {
72+
return GetPointer<const ::flatbuffers::Vector<
73+
::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>*>(VT_GALAXIES);
7874
}
7975
template <bool B = false>
80-
bool Verify(::flatbuffers::VerifierTemplate<B> &verifier) const {
76+
bool Verify(::flatbuffers::VerifierTemplate<B>& verifier) const {
8177
return VerifyTableStart(verifier) &&
8278
VerifyField<double>(verifier, VT_AGE, 8) &&
8379
VerifyOffset(verifier, VT_GALAXIES) &&
8480
verifier.VerifyVector(galaxies()) &&
85-
verifier.VerifyVectorOfTables(galaxies()) &&
86-
verifier.EndTable();
81+
verifier.VerifyVectorOfTables(galaxies()) && verifier.EndTable();
8782
}
8883
};
8984

9085
struct UniverseBuilder {
9186
typedef Universe Table;
92-
::flatbuffers::FlatBufferBuilder &fbb_;
87+
::flatbuffers::FlatBufferBuilder& fbb_;
9388
::flatbuffers::uoffset_t start_;
9489
void add_age(double age) {
9590
fbb_.AddElement<double>(Universe::VT_AGE, age, 0.0);
9691
}
97-
void add_galaxies(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>> galaxies) {
92+
void add_galaxies(::flatbuffers::Offset<::flatbuffers::Vector<
93+
::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>>
94+
galaxies) {
9895
fbb_.AddOffset(Universe::VT_GALAXIES, galaxies);
9996
}
100-
explicit UniverseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
101-
: fbb_(_fbb) {
97+
explicit UniverseBuilder(::flatbuffers::FlatBufferBuilder& _fbb)
98+
: fbb_(_fbb) {
10299
start_ = fbb_.StartTable();
103100
}
104101
::flatbuffers::Offset<Universe> Finish() {
@@ -109,54 +106,60 @@ struct UniverseBuilder {
109106
};
110107

111108
inline ::flatbuffers::Offset<Universe> CreateUniverse(
112-
::flatbuffers::FlatBufferBuilder &_fbb,
113-
double age = 0.0,
114-
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>> galaxies = 0) {
109+
::flatbuffers::FlatBufferBuilder& _fbb, double age = 0.0,
110+
::flatbuffers::Offset<::flatbuffers::Vector<
111+
::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>>
112+
galaxies = 0) {
115113
UniverseBuilder builder_(_fbb);
116114
builder_.add_age(age);
117115
builder_.add_galaxies(galaxies);
118116
return builder_.Finish();
119117
}
120118

121119
inline ::flatbuffers::Offset<Universe> CreateUniverseDirect(
122-
::flatbuffers::FlatBufferBuilder &_fbb,
123-
double age = 0.0,
124-
const std::vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>> *galaxies = nullptr) {
125-
auto galaxies__ = galaxies ? _fbb.CreateVector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>(*galaxies) : 0;
126-
return flatbuffers::goldens::CreateUniverse(
127-
_fbb,
128-
age,
129-
galaxies__);
120+
::flatbuffers::FlatBufferBuilder& _fbb, double age = 0.0,
121+
const std::vector<::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>*
122+
galaxies = nullptr) {
123+
auto galaxies__ =
124+
galaxies
125+
? _fbb.CreateVector<
126+
::flatbuffers::Offset<flatbuffers::goldens::Galaxy>>(*galaxies)
127+
: 0;
128+
return flatbuffers::goldens::CreateUniverse(_fbb, age, galaxies__);
130129
}
131130

132-
inline const flatbuffers::goldens::Universe *GetUniverse(const void *buf) {
131+
inline const flatbuffers::goldens::Universe* GetUniverse(const void* buf) {
133132
return ::flatbuffers::GetRoot<flatbuffers::goldens::Universe>(buf);
134133
}
135134

136-
inline const flatbuffers::goldens::Universe *GetSizePrefixedUniverse(const void *buf) {
137-
return ::flatbuffers::GetSizePrefixedRoot<flatbuffers::goldens::Universe>(buf);
135+
inline const flatbuffers::goldens::Universe* GetSizePrefixedUniverse(
136+
const void* buf) {
137+
return ::flatbuffers::GetSizePrefixedRoot<flatbuffers::goldens::Universe>(
138+
buf);
138139
}
139140

140141
template <bool B = false>
141-
inline bool VerifyUniverseBuffer(
142-
::flatbuffers::VerifierTemplate<B> &verifier) {
143-
return verifier.template VerifyBuffer<flatbuffers::goldens::Universe>(nullptr);
142+
inline bool VerifyUniverseBuffer(::flatbuffers::VerifierTemplate<B>& verifier) {
143+
return verifier.template VerifyBuffer<flatbuffers::goldens::Universe>(
144+
nullptr);
144145
}
145146

146147
template <bool B = false>
147148
inline bool VerifySizePrefixedUniverseBuffer(
148-
::flatbuffers::VerifierTemplate<B> &verifier) {
149-
return verifier.template VerifySizePrefixedBuffer<flatbuffers::goldens::Universe>(nullptr);
149+
::flatbuffers::VerifierTemplate<B>& verifier) {
150+
return verifier
151+
.template VerifySizePrefixedBuffer<flatbuffers::goldens::Universe>(
152+
nullptr);
150153
}
151154

152155
inline void FinishUniverseBuffer(
153-
::flatbuffers::FlatBufferBuilder &fbb,
156+
::flatbuffers::FlatBufferBuilder& fbb,
154157
::flatbuffers::Offset<flatbuffers::goldens::Universe> root) {
155158
fbb.Finish(root);
156159
}
157160

158161
inline void FinishSizePrefixedUniverseBuffer(
159-
::flatbuffers::FlatBufferBuilder &fbb,
162+
::flatbuffers::FlatBufferBuilder& fbb,
160163
::flatbuffers::Offset<flatbuffers::goldens::Universe> root) {
161164
fbb.FinishSizePrefixed(root);
162165
}

grpc/src/compiler/swift_generator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include <map>
2626
#include <sstream>
2727

28-
#include "flatbuffers/util.h"
2928
#include "src/compiler/schema_interface.h"
29+
#include "flatbuffers/util.h"
3030

3131
namespace grpc_swift_generator {
3232
namespace {

grpc/src/compiler/ts_generator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <map>
2727
#include <sstream>
2828

29-
#include "flatbuffers/util.h"
3029
#include "src/compiler/schema_interface.h"
30+
#include "flatbuffers/util.h"
3131

3232
namespace grpc_ts_generator {
3333
namespace {

grpc/tests/grpctest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include <condition_variable>
2020
#include <thread>
2121

22-
#include "monster_test.grpc.fb.h"
23-
#include "monster_test_generated.h"
24-
#include "test_assert.h"
22+
#include "tests/monster_test.grpc.fb.h"
23+
#include "tests/monster_test_generated.h"
24+
#include "tests/test_assert.h"
2525

2626
using namespace MyGame::Example;
2727
using flatbuffers::FlatBufferBuilder;

grpc/tests/grpctest_callback_client_compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <type_traits>
77

8-
#include "monster_test.grpc.fb.h"
8+
#include "tests/monster_test.grpc.fb.h"
99

1010
#if defined(FLATBUFFERS_GENERATED_GRPC_CALLBACK_API) && \
1111
defined(GRPC_CALLBACK_API_NONEXPERIMENTAL)

grpc/tests/grpctest_callback_compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "monster_test.grpc.fb.h"
1+
#include "tests/monster_test.grpc.fb.h"
22

33
// This test only verifies that the generated CallbackService compiles when the
44
// callback API is available. It does not run any RPCs.

grpc/tests/message_builder_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "flatbuffers/grpc.h"
2-
#include "monster_test_generated.h"
3-
#include "test_assert.h"
4-
#include "test_builder.h"
2+
#include "tests/monster_test_generated.h"
3+
#include "tests/test_assert.h"
4+
#include "tests/test_builder.h"
55

66
using MyGame::Example::Any_NONE;
77
using MyGame::Example::CreateStat;

include/flatbuffers/grpc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
// Helper functionality to glue FlatBuffers and GRPC.
2121

22-
#include "flatbuffers/flatbuffers.h"
2322
#include "grpcpp/support/byte_buffer.h"
2423
#include "grpcpp/support/slice.h"
24+
#include "flatbuffers/flatbuffers.h"
2525

2626
namespace flatbuffers {
2727
namespace grpc {

include/flatbuffers/idl.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,7 @@ struct IDLOptions {
664664
bool generate_name_strings;
665665
bool generate_object_based_api;
666666
bool gen_compare;
667+
bool gen_absl_hash;
667668
std::string cpp_object_api_pointer_type;
668669
std::string cpp_object_api_string_type;
669670
bool cpp_object_api_string_flexible_constructor;
@@ -818,6 +819,7 @@ struct IDLOptions {
818819
generate_name_strings(false),
819820
generate_object_based_api(false),
820821
gen_compare(false),
822+
gen_absl_hash(false),
821823
cpp_object_api_pointer_type("std::unique_ptr"),
822824
cpp_object_api_string_flexible_constructor(false),
823825
cpp_object_api_field_case_style(CaseStyle_Unchanged),

0 commit comments

Comments
 (0)