aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPaul Reimer <paulreimer@users.noreply.github.com>2018-04-05 16:00:54 -0700
committerWouter van Oortmerssen <aardappel@gmail.com>2018-04-05 16:00:54 -0700
commiteac0bc649029c32576610c811e241155973e6187 (patch)
tree325af8a9e6077d4d70dd113eb174956faf121d58 /docs
parent20a400e940634108bad812f571582eeffc728eac (diff)
downloadflatbuffers-eac0bc649029c32576610c811e241155973e6187.tar.gz
Add FLATBUFFERS_ prefix to defines [C++] (#4695)
* 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`
Diffstat (limited to 'docs')
-rw-r--r--docs/source/Internals.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/source/Internals.md b/docs/source/Internals.md
index 60b81300..e8f453a8 100644
--- a/docs/source/Internals.md
+++ b/docs/source/Internals.md
@@ -169,7 +169,7 @@ Unions share a lot with enums.
Predeclare all data types since circular references between types are allowed
(circular references between object are not, though).
- MANUALLY_ALIGNED_STRUCT(4) Vec3 {
+ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vec3 {
private:
float x_;
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 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
might normally do, since we add padding manually (though none in this example),