Commit af3c5981 authored by Paul Reimer's avatar Paul Reimer Committed by Wouter van Oortmerssen

Rename MANUALLY_ALIGNED_STRUCT to add FLATBUFFERS_ prefix in generated code…

Rename MANUALLY_ALIGNED_STRUCT to add FLATBUFFERS_ prefix in generated code within tests/. Via running `cd tests && sh generate_code.sh` (#4696)
parent eac0bc64
...@@ -136,7 +136,7 @@ struct EquipmentUnion { ...@@ -136,7 +136,7 @@ struct EquipmentUnion {
bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Equipment type); bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Equipment type);
bool VerifyEquipmentVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types); bool VerifyEquipmentVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
private: private:
float x_; float x_;
float y_; float y_;
......
...@@ -218,7 +218,7 @@ struct AnyUnion { ...@@ -218,7 +218,7 @@ struct AnyUnion {
bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type); bool VerifyAny(flatbuffers::Verifier &verifier, const void *obj, Any type);
bool VerifyAnyVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types); bool VerifyAnyVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
private: private:
int16_t a_; int16_t a_;
int8_t b_; int8_t b_;
...@@ -249,7 +249,7 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS { ...@@ -249,7 +249,7 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
}; };
FLATBUFFERS_STRUCT_END(Test, 4); FLATBUFFERS_STRUCT_END(Test, 4);
MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
private: private:
float x_; float x_;
float y_; float y_;
...@@ -318,7 +318,7 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS { ...@@ -318,7 +318,7 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
}; };
FLATBUFFERS_STRUCT_END(Vec3, 32); FLATBUFFERS_STRUCT_END(Vec3, 32);
MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private: private:
uint32_t id_; uint32_t id_;
uint32_t distance_; uint32_t distance_;
......
...@@ -49,7 +49,7 @@ inline const char *EnumNameEnumInNestedNS(EnumInNestedNS e) { ...@@ -49,7 +49,7 @@ inline const char *EnumNameEnumInNestedNS(EnumInNestedNS e) {
return EnumNamesEnumInNestedNS()[index]; return EnumNamesEnumInNestedNS()[index];
} }
MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS {
private: private:
int32_t a_; int32_t a_;
int32_t b_; int32_t b_;
......
...@@ -141,7 +141,7 @@ struct CharacterUnion { ...@@ -141,7 +141,7 @@ struct CharacterUnion {
bool VerifyCharacter(flatbuffers::Verifier &verifier, const void *obj, Character type); bool VerifyCharacter(flatbuffers::Verifier &verifier, const void *obj, Character type);
bool VerifyCharacterVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types); bool VerifyCharacterVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
private: private:
int32_t hair_length_; int32_t hair_length_;
...@@ -161,7 +161,7 @@ MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS { ...@@ -161,7 +161,7 @@ MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
}; };
FLATBUFFERS_STRUCT_END(Rapunzel, 4); FLATBUFFERS_STRUCT_END(Rapunzel, 4);
MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
private: private:
int32_t books_read_; int32_t books_read_;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment