BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

Add missed defined(clang) and fix the wrong placement of #pragma push/pop for MSVC compiler (#4946)

Browse Source
This commit is contained in:
Vladimir Glavnyy
2018-09-28 02:31:43 +07:00
committed by Wouter van Oortmerssen
parent 43132560f9
commit d48f08acfe
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/flatbuffers/flatbuffers.h
View File

@@ -934,12 +934,12 @@ class FlatBufferBuilder {
}
/// @brief Get the released pointer to the serialized buffer.
/// @param The size of the memory block containing
/// @param The size of the memory block containing
/// the serialized `FlatBuffer`.
/// @param The offset from the released pointer where the finished
/// @param The offset from the released pointer where the finished
/// `FlatBuffer` starts.
/// @return A raw pointer to the start of the memory block containing
/// the serialized `FlatBuffer`.
/// @return A raw pointer to the start of the memory block containing
/// the serialized `FlatBuffer`.
/// @remark If the allocator is owned, it gets deleted during this call.
uint8_t *ReleaseRaw(size_t &size, size_t &offset) {
Finished();
@@ -2482,9 +2482,6 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
/// @endcond
} // namespace flatbuffers
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
// clang-format on
#endif // FLATBUFFERS_H_