BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 20:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent shadow with _{{FIELD_NAME}} (#6991)

Browse Source
This commit is contained in:
Derek Bailey
2021-12-13 21:27:36 -08:00
committed by GitHub
parent 4264daadd2
commit a22b1b6267
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/flatbuffers/reflection_generated.h
View File

@@ -261,8 +261,8 @@ struct KeyValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const KeyValue *o) const { bool KeyCompareLessThan(const KeyValue *o) const {
return *key() < *o->key(); return *key() < *o->key();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_key) const {
return strcmp(key()->c_str(), val); return strcmp(key()->c_str(), _key);
} }
const flatbuffers::String *value() const { const flatbuffers::String *value() const {
return GetPointer<const flatbuffers::String *>(VT_VALUE); return GetPointer<const flatbuffers::String *>(VT_VALUE);
@@ -338,8 +338,8 @@ struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const EnumVal *o) const { bool KeyCompareLessThan(const EnumVal *o) const {
return value() < o->value(); return value() < o->value();
} }
int KeyCompareWithValue(int64_t val) const { int KeyCompareWithValue(int64_t _value) const {
return static_cast<int>(value() > val) - static_cast<int>(value() < val); return static_cast<int>(value() > _value) - static_cast<int>(value() < _value);
} }
const reflection::Type *union_type() const { const reflection::Type *union_type() const {
return GetPointer<const reflection::Type *>(VT_UNION_TYPE); return GetPointer<const reflection::Type *>(VT_UNION_TYPE);
@@ -436,8 +436,8 @@ struct Enum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Enum *o) const { bool KeyCompareLessThan(const Enum *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const flatbuffers::Vector<flatbuffers::Offset<reflection::EnumVal>> *values() const { const flatbuffers::Vector<flatbuffers::Offset<reflection::EnumVal>> *values() const {
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::EnumVal>> *>(VT_VALUES); return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::EnumVal>> *>(VT_VALUES);
@@ -587,8 +587,8 @@ struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Field *o) const { bool KeyCompareLessThan(const Field *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const reflection::Type *type() const { const reflection::Type *type() const {
return GetPointer<const reflection::Type *>(VT_TYPE); return GetPointer<const reflection::Type *>(VT_TYPE);
@@ -793,8 +793,8 @@ struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Object *o) const { bool KeyCompareLessThan(const Object *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const flatbuffers::Vector<flatbuffers::Offset<reflection::Field>> *fields() const { const flatbuffers::Vector<flatbuffers::Offset<reflection::Field>> *fields() const {
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::Field>> *>(VT_FIELDS); return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::Field>> *>(VT_FIELDS);
@@ -945,8 +945,8 @@ struct RPCCall FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const RPCCall *o) const { bool KeyCompareLessThan(const RPCCall *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const reflection::Object *request() const { const reflection::Object *request() const {
return GetPointer<const reflection::Object *>(VT_REQUEST); return GetPointer<const reflection::Object *>(VT_REQUEST);
@@ -1061,8 +1061,8 @@ struct Service FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Service *o) const { bool KeyCompareLessThan(const Service *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const flatbuffers::Vector<flatbuffers::Offset<reflection::RPCCall>> *calls() const { const flatbuffers::Vector<flatbuffers::Offset<reflection::RPCCall>> *calls() const {
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::RPCCall>> *>(VT_CALLS); return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<reflection::RPCCall>> *>(VT_CALLS);
@@ -1180,8 +1180,8 @@ struct SchemaFile FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const SchemaFile *o) const { bool KeyCompareLessThan(const SchemaFile *o) const {
return *filename() < *o->filename(); return *filename() < *o->filename();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_filename) const {
return strcmp(filename()->c_str(), val); return strcmp(filename()->c_str(), _filename);
} }
/// Names of included files, relative to project root. /// Names of included files, relative to project root.
const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *included_filenames() const { const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *included_filenames() const {

10
src/idl_gen_cpp.cpp
View File

@@ -2033,8 +2033,8 @@ class CppGenerator : public BaseGenerator {
code_ += " }"; code_ += " }";
if (is_string) { if (is_string) {
code_ += " int KeyCompareWithValue(const char *val) const {"; code_ += " int KeyCompareWithValue(const char *_{{FIELD_NAME}}) const {";
code_ += " return strcmp({{FIELD_NAME}}()->c_str(), val);"; code_ += " return strcmp({{FIELD_NAME}}()->c_str(), _{{FIELD_NAME}});";
code_ += " }"; code_ += " }";
} else { } else {
FLATBUFFERS_ASSERT(IsScalar(field.value.type.base_type)); FLATBUFFERS_ASSERT(IsScalar(field.value.type.base_type));
@@ -2045,10 +2045,10 @@ class CppGenerator : public BaseGenerator {
} }
// Returns {field<val: -1, field==val: 0, field>val: +1}. // Returns {field<val: -1, field==val: 0, field>val: +1}.
code_.SetValue("KEY_TYPE", type); code_.SetValue("KEY_TYPE", type);
code_ += " int KeyCompareWithValue({{KEY_TYPE}} val) const {"; code_ += " int KeyCompareWithValue({{KEY_TYPE}} _{{FIELD_NAME}}) const {";
code_ += code_ +=
" return static_cast<int>({{FIELD_NAME}}() > val) - " " return static_cast<int>({{FIELD_NAME}}() > _{{FIELD_NAME}}) - "
"static_cast<int>({{FIELD_NAME}}() < val);"; "static_cast<int>({{FIELD_NAME}}() < _{{FIELD_NAME}});";
code_ += " }"; code_ += " }";
} }
} }

16
tests/cpp17/generated_cpp17/monster_test_generated.h
View File

@@ -694,8 +694,8 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Ability *o) const { bool KeyCompareLessThan(const Ability *o) const {
return id() < o->id(); return id() < o->id();
} }
int KeyCompareWithValue(uint32_t val) const { int KeyCompareWithValue(uint32_t _id) const {
return static_cast<int>(id() > val) - static_cast<int>(id() < val); return static_cast<int>(id() > _id) - static_cast<int>(id() < _id);
} }
uint32_t distance() const { uint32_t distance() const {
return flatbuffers::EndianScalar(distance_); return flatbuffers::EndianScalar(distance_);
@@ -1017,8 +1017,8 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Stat *o) const { bool KeyCompareLessThan(const Stat *o) const {
return count() < o->count(); return count() < o->count();
} }
int KeyCompareWithValue(uint16_t val) const { int KeyCompareWithValue(uint16_t _count) const {
return static_cast<int>(count() > val) - static_cast<int>(count() < val); return static_cast<int>(count() > _count) - static_cast<int>(count() < _count);
} }
template<size_t Index> template<size_t Index>
auto get_field() const { auto get_field() const {
@@ -1130,8 +1130,8 @@ struct Referrable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Referrable *o) const { bool KeyCompareLessThan(const Referrable *o) const {
return id() < o->id(); return id() < o->id();
} }
int KeyCompareWithValue(uint64_t val) const { int KeyCompareWithValue(uint64_t _id) const {
return static_cast<int>(id() > val) - static_cast<int>(id() < val); return static_cast<int>(id() > _id) - static_cast<int>(id() < _id);
} }
template<size_t Index> template<size_t Index>
auto get_field() const { auto get_field() const {
@@ -1327,8 +1327,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Monster *o) const { bool KeyCompareLessThan(const Monster *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const flatbuffers::Vector<uint8_t> *inventory() const { const flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);

16
tests/monster_test_generated.h
View File

@@ -788,8 +788,8 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Ability FLATBUFFERS_FINAL_CLASS {
bool KeyCompareLessThan(const Ability *o) const { bool KeyCompareLessThan(const Ability *o) const {
return id() < o->id(); return id() < o->id();
} }
int KeyCompareWithValue(uint32_t val) const { int KeyCompareWithValue(uint32_t _id) const {
return static_cast<int>(id() > val) - static_cast<int>(id() < val); return static_cast<int>(id() > _id) - static_cast<int>(id() < _id);
} }
uint32_t distance() const { uint32_t distance() const {
return flatbuffers::EndianScalar(distance_); return flatbuffers::EndianScalar(distance_);
@@ -1053,8 +1053,8 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Stat *o) const { bool KeyCompareLessThan(const Stat *o) const {
return count() < o->count(); return count() < o->count();
} }
int KeyCompareWithValue(uint16_t val) const { int KeyCompareWithValue(uint16_t _count) const {
return static_cast<int>(count() > val) - static_cast<int>(count() < val); return static_cast<int>(count() > _count) - static_cast<int>(count() < _count);
} }
bool Verify(flatbuffers::Verifier &verifier) const { bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
@@ -1143,8 +1143,8 @@ struct Referrable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Referrable *o) const { bool KeyCompareLessThan(const Referrable *o) const {
return id() < o->id(); return id() < o->id();
} }
int KeyCompareWithValue(uint64_t val) const { int KeyCompareWithValue(uint64_t _id) const {
return static_cast<int>(id() > val) - static_cast<int>(id() < val); return static_cast<int>(id() > _id) - static_cast<int>(id() < _id);
} }
bool Verify(flatbuffers::Verifier &verifier) const { bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
@@ -1321,8 +1321,8 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool KeyCompareLessThan(const Monster *o) const { bool KeyCompareLessThan(const Monster *o) const {
return *name() < *o->name(); return *name() < *o->name();
} }
int KeyCompareWithValue(const char *val) const { int KeyCompareWithValue(const char *_name) const {
return strcmp(name()->c_str(), val); return strcmp(name()->c_str(), _name);
} }
const flatbuffers::Vector<uint8_t> *inventory() const { const flatbuffers::Vector<uint8_t> *inventory() const {
return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);