BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-04 02:24:12 +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

4
docs/source/Internals.md
View File

@@ -169,7 +169,7 @@ Unions share a lot with enums.
Predeclare all data types since circular references between types are allowed Predeclare all data types since circular references between types are allowed
(circular references between object are not, though). (circular references between object are not, though).
MANUALLY_ALIGNED_STRUCT(4) Vec3 { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vec3 {
private: private:
float x_; float x_;
float y_; float y_;
@@ -183,7 +183,7 @@ Predeclare all data types since circular references between types are allowed
float y() const { return flatbuffers::EndianScalar(y_); } float y() const { return flatbuffers::EndianScalar(y_); }
float z() const { return flatbuffers::EndianScalar(z_); } float z() const { return flatbuffers::EndianScalar(z_); }
}; };
STRUCT_END(Vec3, 12); FLATBUFFERS_STRUCT_END(Vec3, 12);
These ugly macros do a couple of things: they turn off any padding the compiler These ugly macros do a couple of things: they turn off any padding the compiler
might normally do, since we add padding manually (though none in this example), might normally do, since we add padding manually (though none in this example),

10
include/flatbuffers/flatbuffers.h
View File

@@ -2131,17 +2131,17 @@ inline int LookupEnum(const char **names, const char *name) {
// clang-format off // clang-format off
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define MANUALLY_ALIGNED_STRUCT(alignment) \ #define FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(alignment) \
__pragma(pack(1)); \ __pragma(pack(1)); \
struct __declspec(align(alignment)) struct __declspec(align(alignment))
#define STRUCT_END(name, size) \ #define FLATBUFFERS_STRUCT_END(name, size) \
__pragma(pack()); \ __pragma(pack()); \
static_assert(sizeof(name) == size, "compiler breaks packing rules") static_assert(sizeof(name) == size, "compiler breaks packing rules")
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)
#define MANUALLY_ALIGNED_STRUCT(alignment) \ #define FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(alignment) \
_Pragma("pack(1)") \ _Pragma("pack(1)") \
struct __attribute__((aligned(alignment))) struct __attribute__((aligned(alignment)))
#define STRUCT_END(name, size) \ #define FLATBUFFERS_STRUCT_END(name, size) \
_Pragma("pack()") \ _Pragma("pack()") \
static_assert(sizeof(name) == size, "compiler breaks packing rules") static_assert(sizeof(name) == size, "compiler breaks packing rules")
#else #else
@@ -2240,7 +2240,7 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
#endif // !defined(_WIN32) && !defined(__CYGWIN__) #endif // !defined(_WIN32) && !defined(__CYGWIN__)
#define DEFINE_BITMASK_OPERATORS(E, T)\ #define FLATBUFFERS_DEFINE_BITMASK_OPERATORS(E, T)\
inline E operator | (E lhs, E rhs){\ inline E operator | (E lhs, E rhs){\
return E(T(lhs) | T(rhs));\ return E(T(lhs) | T(rhs));\
}\ }\

2
samples/monster_generated.h
View File

@@ -170,7 +170,7 @@ MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&z_, _z); flatbuffers::WriteScalar(&z_, _z);
} }
}; };
STRUCT_END(Vec3, 12); FLATBUFFERS_STRUCT_END(Vec3, 12);
struct MonsterT : public flatbuffers::NativeTable { struct MonsterT : public flatbuffers::NativeTable {
typedef Monster TableType; typedef Monster TableType;

6
src/idl_gen_cpp.cpp
View File

@@ -922,7 +922,7 @@ class CppGenerator : public BaseGenerator {
code_ += "};"; code_ += "};";
if (parser_.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags")) { if (parser_.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags")) {
code_ += "DEFINE_BITMASK_OPERATORS({{ENUM_NAME}}, {{BASE_TYPE}})"; code_ += "FLATBUFFERS_DEFINE_BITMASK_OPERATORS({{ENUM_NAME}}, {{BASE_TYPE}})";
} }
code_ += ""; code_ += "";
@@ -2434,7 +2434,7 @@ class CppGenerator : public BaseGenerator {
code_.SetValue("STRUCT_NAME", Name(struct_def)); code_.SetValue("STRUCT_NAME", Name(struct_def));
code_ += code_ +=
"MANUALLY_ALIGNED_STRUCT({{ALIGN}}) " "FLATBUFFERS_MANUALLY_ALIGNED_STRUCT({{ALIGN}}) "
"{{STRUCT_NAME}} FLATBUFFERS_FINAL_CLASS {"; "{{STRUCT_NAME}} FLATBUFFERS_FINAL_CLASS {";
code_ += " private:"; code_ += " private:";
@@ -2576,7 +2576,7 @@ class CppGenerator : public BaseGenerator {
code_ += "};"; code_ += "};";
code_.SetValue("STRUCT_BYTE_SIZE", NumToString(struct_def.bytesize)); code_.SetValue("STRUCT_BYTE_SIZE", NumToString(struct_def.bytesize));
code_ += "STRUCT_END({{STRUCT_NAME}}, {{STRUCT_BYTE_SIZE}});"; code_ += "FLATBUFFERS_STRUCT_END({{STRUCT_NAME}}, {{STRUCT_BYTE_SIZE}});";
code_ += ""; code_ += "";
} }

6
tests/monster_test_generated.h
View File

@@ -247,7 +247,7 @@ MANUALLY_ALIGNED_STRUCT(2) Test FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&b_, _b); flatbuffers::WriteScalar(&b_, _b);
} }
}; };
STRUCT_END(Test, 4); FLATBUFFERS_STRUCT_END(Test, 4);
MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS { MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
private: private:
@@ -316,7 +316,7 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
return test3_; return test3_;
} }
}; };
STRUCT_END(Vec3, 32); FLATBUFFERS_STRUCT_END(Vec3, 32);
MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS { MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
private: private:
@@ -351,7 +351,7 @@ MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&distance_, _distance); flatbuffers::WriteScalar(&distance_, _distance);
} }
}; };
STRUCT_END(Ability, 8); FLATBUFFERS_STRUCT_END(Ability, 8);
} // namespace Example } // 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); flatbuffers::WriteScalar(&b_, _b);
} }
}; };
STRUCT_END(StructInNestedNS, 8); FLATBUFFERS_STRUCT_END(StructInNestedNS, 8);
struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct TableInNestedNS FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
static const flatbuffers::TypeTable *MiniReflectTypeTable() { 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); flatbuffers::WriteScalar(&hair_length_, _hair_length);
} }
}; };
STRUCT_END(Rapunzel, 4); FLATBUFFERS_STRUCT_END(Rapunzel, 4);
MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS { MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
private: private:
@@ -179,7 +179,7 @@ MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
flatbuffers::WriteScalar(&books_read_, _books_read); flatbuffers::WriteScalar(&books_read_, _books_read);
} }
}; };
STRUCT_END(BookReader, 4); FLATBUFFERS_STRUCT_END(BookReader, 4);
struct AttackerT : public flatbuffers::NativeTable { struct AttackerT : public flatbuffers::NativeTable {
typedef Attacker TableType; typedef Attacker TableType;