mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-20 19:27:31 +00:00
[C++] Refactor to conform to Google C++ style guide (#5608)
* Automatic refractor of C++ headers to Google C++ style guide * Automatic refractor of C++ source to Google C++ style guide * Automatic refractor of C++ tests to Google C++ style guide * Fixed clang-format issues by running clang-format twice to correct itself. Kotlin was missing clang-format on after turning it off, so it was changed,
This commit is contained in:
committed by
Wouter van Oortmerssen
parent
e837d5a296
commit
f0f0efe7b8
@@ -3,8 +3,9 @@
|
||||
|
||||
#include <set>
|
||||
#include <type_traits>
|
||||
#include "monster_test_generated.h"
|
||||
|
||||
#include "flatbuffers/flatbuffers.h"
|
||||
#include "monster_test_generated.h"
|
||||
#include "test_assert.h"
|
||||
|
||||
using MyGame::Example::Color;
|
||||
@@ -14,17 +15,11 @@ namespace flatbuffers {
|
||||
namespace grpc {
|
||||
class MessageBuilder;
|
||||
}
|
||||
}
|
||||
} // namespace flatbuffers
|
||||
|
||||
template <class T, class U>
|
||||
struct is_same {
|
||||
static const bool value = false;
|
||||
};
|
||||
template<class T, class U> struct is_same { static const bool value = false; };
|
||||
|
||||
template <class T>
|
||||
struct is_same<T, T> {
|
||||
static const bool value = true;
|
||||
};
|
||||
template<class T> struct is_same<T, T> { static const bool value = true; };
|
||||
|
||||
extern const std::string m1_name;
|
||||
extern const Color m1_color;
|
||||
@@ -34,30 +29,36 @@ extern const Color m2_color;
|
||||
flatbuffers::Offset<Monster> populate1(flatbuffers::FlatBufferBuilder &builder);
|
||||
flatbuffers::Offset<Monster> populate2(flatbuffers::FlatBufferBuilder &builder);
|
||||
|
||||
uint8_t *release_raw_base(flatbuffers::FlatBufferBuilder &fbb, size_t &size, size_t &offset);
|
||||
uint8_t *release_raw_base(flatbuffers::FlatBufferBuilder &fbb, size_t &size,
|
||||
size_t &offset);
|
||||
|
||||
void free_raw(flatbuffers::grpc::MessageBuilder &mbb, uint8_t *buf);
|
||||
void free_raw(flatbuffers::FlatBufferBuilder &fbb, uint8_t *buf);
|
||||
|
||||
bool verify(const flatbuffers::DetachedBuffer &buf, const std::string &expected_name, Color color);
|
||||
bool verify(const uint8_t *buf, size_t offset, const std::string &expected_name, Color color);
|
||||
bool verify(const flatbuffers::DetachedBuffer &buf,
|
||||
const std::string &expected_name, Color color);
|
||||
bool verify(const uint8_t *buf, size_t offset, const std::string &expected_name,
|
||||
Color color);
|
||||
|
||||
bool release_n_verify(flatbuffers::FlatBufferBuilder &fbb, const std::string &expected_name, Color color);
|
||||
bool release_n_verify(flatbuffers::grpc::MessageBuilder &mbb, const std::string &expected_name, Color color);
|
||||
bool release_n_verify(flatbuffers::FlatBufferBuilder &fbb,
|
||||
const std::string &expected_name, Color color);
|
||||
bool release_n_verify(flatbuffers::grpc::MessageBuilder &mbb,
|
||||
const std::string &expected_name, Color color);
|
||||
|
||||
// clang-format off
|
||||
#if !defined(FLATBUFFERS_CPP98_STL)
|
||||
// clang-format on
|
||||
// Invokes this function when testing the following Builder types
|
||||
// FlatBufferBuilder, TestHeapBuilder, and GrpcLikeMessageBuilder
|
||||
template <class Builder>
|
||||
template<class Builder>
|
||||
void builder_move_assign_after_releaseraw_test(Builder b1) {
|
||||
auto root_offset1 = populate1(b1);
|
||||
b1.Finish(root_offset1);
|
||||
size_t size, offset;
|
||||
std::shared_ptr<uint8_t> raw(b1.ReleaseRaw(size, offset), [size](uint8_t *ptr) {
|
||||
flatbuffers::DefaultAllocator::dealloc(ptr, size);
|
||||
});
|
||||
std::shared_ptr<uint8_t> raw(
|
||||
b1.ReleaseRaw(size, offset), [size](uint8_t *ptr) {
|
||||
flatbuffers::DefaultAllocator::dealloc(ptr, size);
|
||||
});
|
||||
Builder src;
|
||||
auto root_offset2 = populate2(src);
|
||||
src.Finish(root_offset2);
|
||||
@@ -72,9 +73,10 @@ void builder_move_assign_after_releaseraw_test(Builder b1) {
|
||||
#endif // !defined(FLATBUFFERS_CPP98_STL)
|
||||
// clang-format on
|
||||
|
||||
void builder_move_assign_after_releaseraw_test(flatbuffers::grpc::MessageBuilder b1);
|
||||
void builder_move_assign_after_releaseraw_test(
|
||||
flatbuffers::grpc::MessageBuilder b1);
|
||||
|
||||
template <class DestBuilder, class SrcBuilder = DestBuilder>
|
||||
template<class DestBuilder, class SrcBuilder = DestBuilder>
|
||||
struct BuilderTests {
|
||||
// clang-format off
|
||||
#if !defined(FLATBUFFERS_CPP98_STL)
|
||||
@@ -164,9 +166,10 @@ struct BuilderTests {
|
||||
#endif // !defined(FLATBUFFERS_CPP98_STL)
|
||||
// clang-format on
|
||||
|
||||
static void builder_swap_before_finish_test(bool run = is_same<DestBuilder, SrcBuilder>::value) {
|
||||
static void builder_swap_before_finish_test(
|
||||
bool run = is_same<DestBuilder, SrcBuilder>::value) {
|
||||
/// Swap is allowed only when lhs and rhs are the same concrete type.
|
||||
if(run) {
|
||||
if (run) {
|
||||
SrcBuilder src;
|
||||
auto root_offset1 = populate1(src);
|
||||
auto size1 = src.GetSize();
|
||||
@@ -183,9 +186,10 @@ struct BuilderTests {
|
||||
}
|
||||
}
|
||||
|
||||
static void builder_swap_after_finish_test(bool run = is_same<DestBuilder, SrcBuilder>::value) {
|
||||
static void builder_swap_after_finish_test(
|
||||
bool run = is_same<DestBuilder, SrcBuilder>::value) {
|
||||
/// Swap is allowed only when lhs and rhs are the same concrete type.
|
||||
if(run) {
|
||||
if (run) {
|
||||
SrcBuilder src;
|
||||
auto root_offset1 = populate1(src);
|
||||
src.Finish(root_offset1);
|
||||
@@ -233,12 +237,9 @@ enum BuilderReuseTestSelector {
|
||||
|
||||
typedef std::set<BuilderReuseTestSelector> TestSelector;
|
||||
|
||||
template <class DestBuilder, class SrcBuilder>
|
||||
struct BuilderReuseTests {
|
||||
template<class DestBuilder, class SrcBuilder> struct BuilderReuseTests {
|
||||
static void builder_reusable_after_release_test(TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE)) {
|
||||
return;
|
||||
}
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE)) { return; }
|
||||
|
||||
DestBuilder fbb;
|
||||
std::vector<flatbuffers::DetachedBuffer> buffers;
|
||||
@@ -251,9 +252,7 @@ struct BuilderReuseTests {
|
||||
}
|
||||
|
||||
static void builder_reusable_after_releaseraw_test(TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_RAW)) {
|
||||
return;
|
||||
}
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_RAW)) { return; }
|
||||
|
||||
DestBuilder fbb;
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
@@ -269,10 +268,9 @@ struct BuilderReuseTests {
|
||||
// clang-format off
|
||||
#if !defined(FLATBUFFERS_CPP98_STL)
|
||||
// clang-format on
|
||||
static void builder_reusable_after_release_and_move_assign_test(TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN)) {
|
||||
return;
|
||||
}
|
||||
static void builder_reusable_after_release_and_move_assign_test(
|
||||
TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN)) { return; }
|
||||
|
||||
DestBuilder dst;
|
||||
std::vector<flatbuffers::DetachedBuffer> buffers;
|
||||
@@ -287,10 +285,9 @@ struct BuilderReuseTests {
|
||||
}
|
||||
}
|
||||
|
||||
static void builder_reusable_after_releaseraw_and_move_assign_test(TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN)) {
|
||||
return;
|
||||
}
|
||||
static void builder_reusable_after_releaseraw_and_move_assign_test(
|
||||
TestSelector selector) {
|
||||
if (!selector.count(REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN)) { return; }
|
||||
|
||||
DestBuilder dst;
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
@@ -323,4 +320,4 @@ struct BuilderReuseTests {
|
||||
}
|
||||
};
|
||||
|
||||
#endif // TEST_BUILDER_H
|
||||
#endif // TEST_BUILDER_H
|
||||
|
||||
Reference in New Issue
Block a user