BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-28 06:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add FLATBUFFERS_ prefix to defines [C++] (#4695)

Browse Source 
* Rename STRUCT_END to add FLATBUFFERS_ prefix, now FLATBUFFERS_STRUCT_END. Via running `ag -l STRUCT_END | xargs rpl STRUCT_END FLATBUFFERS_STRUCT_END`

* Rename MANUALLY_ALIGNED_STRUCT to add FLATBUFFERS_ prefix, now FLATBUFFERS_MANUALLY_ALIGNED_STRUCT. Via running `ag -l MANUALLY_ALIGNED_STRUCT | xargs rpl MANUALLY_ALIGNED_STRUCT FLATBUFFERS_MANUALLY_ALIGNED_STRUCT && cd tests && sh generate_code.sh`

* Rename DEFINE_BITMASK_OPERATORS to add FLATBUFFERS_ prefix, now FLATBUFFERS_DEFINE_BITMASK_OPERATORS. Via running `ag -l DEFINE_BITMASK_OPERATORS | xargs rpl DEFINE_BITMASK_OPERATORS FLATBUFFERS_DEFINE_BITMASK_OPERATORS`
This commit is contained in:
Paul Reimer
2018-04-05 16:00:54 -07:00
committed by Wouter van Oortmerssen
parent 20a400e940
commit eac0bc6490
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/monster_test_generated.h
View File

@@ -247,7 +247,7 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&b_, _b);
}
};
STRUCT_END(Test, 4);
FLATBUFFERS_STRUCT_END(Test, 4);
MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
private:
@@ -316,7 +316,7 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
return test3_;
}
};
STRUCT_END(Vec3, 32);
FLATBUFFERS_STRUCT_END(Vec3, 32);
MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private:
@@ -351,7 +351,7 @@ MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&distance_, _distance);
}
};
STRUCT_END(Ability, 8);
FLATBUFFERS_STRUCT_END(Ability, 8);
} // namespace Example

2
tests/namespace_test/namespace_test1_generated.h
View File

@@ -75,7 +75,7 @@ MANUALLY_ALIGNED_STRUCT(4) StructInNestedNS FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&b_, _b);
}
};
STRUCT_END(StructInNestedNS, 8);
FLATBUFFERS_STRUCT_END(StructInNestedNS, 8);
struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() {

4
tests/union_vector/union_vector_generated.h
View File

@@ -159,7 +159,7 @@ MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&hair_length_, _hair_length);
}
};
STRUCT_END(Rapunzel, 4);
FLATBUFFERS_STRUCT_END(Rapunzel, 4);
MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
private:
@@ -179,7 +179,7 @@ MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&books_read_, _books_read);
}
};
STRUCT_END(BookReader, 4);
FLATBUFFERS_STRUCT_END(BookReader, 4);
struct AttackerT : public flatbuffers::NativeTable {
typedef Attacker TableType;