BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-11 15:37:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements to the C++ API.

Browse Source 
Change-Id: Ib30ffbbd140a8b82fe664129fa4e8c55836267f8
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2015-06-17 16:56:50 -07:00
parent 576022c64b
commit c967515da5
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/flatbuffers/flatbuffers.h
View File

@@ -273,6 +273,8 @@ public:
return IndirectHelper<T>::Read(Data(), i);
}
return_type operator[](uoffset_t i) const { return Get(i); }
// If this is a Vector of enums, T will be its storage type, not the enum
// type. This function makes it convenient to retrieve value with enum
// type E.
@@ -293,7 +295,7 @@ public:
// Change elements if you have a non-const pointer to this object.
void Mutate(uoffset_t i, T val) {
assert(i < size());
WriteScalar(Data() + i * sizeof(T), val);
WriteScalar(data() + i, val);
}
// The raw data in little endian format. Use with care.
@@ -305,6 +307,10 @@ public:
return reinterpret_cast<uint8_t *>(&length_ + 1);
}
// Similarly, but typed, much like std::vector::data
const T *data() const { return reinterpret_cast<const T *>(Data()); }
T *data() { return reinterpret_cast<T *>(Data()); }
template<typename K> return_type LookupByKey(K key) const {
void *search_result = std::bsearch(&key, Data(), size(),
IndirectHelper<T>::element_stride, KeyCompare<K>);
@@ -345,6 +351,7 @@ template<typename T> static inline size_t VectorLength(const Vector<T> *v) {
struct String : public Vector<char> {
const char *c_str() const { return reinterpret_cast<const char *>(Data()); }
std::string str() const { return c_str(); }
bool operator <(const String &o) const {
return strcmp(c_str(), o.c_str()) < 0;
@@ -509,6 +516,10 @@ class FlatBufferBuilder FLATBUFFERS_FINAL_CLASS {
// Get the released pointer to the serialized buffer.
// Don't attempt to use this FlatBufferBuilder afterwards!
// The unique_ptr returned has a special allocator that knows how to
// deallocate this pointer (since it points to the middle of an allocation).
// Thus, do not mix this pointer with other unique_ptr's, or call release() /
// reset() on it.
unique_ptr_t ReleaseBufferPointer() { return buf_.release(); }
void ForceDefaults(bool fd) { force_defaults_ = fd; }

2
include/flatbuffers/reflection.h
View File

@@ -313,7 +313,7 @@ class ResizeContext {
auto enumdef = schema_.enums()->Get(fielddef->type()->index());
// TODO: this is clumsy and slow, but no other way to find it?
auto type_field = fielddefs->LookupByKey(
(fielddef->name()->c_str() + std::string("_type")).c_str());
(fielddef->name()->str() + "_type").c_str());
assert(type_field);
auto union_type = GetFieldI<uint8_t>(table, type_field);
auto enumval = enumdef->values()->LookupByKey(union_type);