Use a bool for ForceDefaults instead of an int
The actual function takes a bool.
While we are doing this, add a couple missing ForceDefaults.
Change-Id: I7fd41c048dae340ca4f339230ceb033349db0faf
diff --git a/aos/flatbuffer_merge.h b/aos/flatbuffer_merge.h
index 5e84160..418ea5e 100644
--- a/aos/flatbuffer_merge.h
+++ b/aos/flatbuffer_merge.h
@@ -55,7 +55,7 @@
inline aos::FlatbufferDetachedBuffer<T> MergeFlatBuffers(const T *fb1,
const T *fb2) {
flatbuffers::FlatBufferBuilder fbb;
- fbb.ForceDefaults(1);
+ fbb.ForceDefaults(true);
fbb.Finish(MergeFlatBuffers<T>(
reinterpret_cast<const flatbuffers::Table *>(fb1),
reinterpret_cast<const flatbuffers::Table *>(fb2), &fbb));
@@ -72,7 +72,7 @@
template <class T>
inline FlatbufferDetachedBuffer<T> CopyFlatBuffer(const T *t) {
flatbuffers::FlatBufferBuilder fbb;
- fbb.ForceDefaults(1);
+ fbb.ForceDefaults(true);
fbb.Finish(CopyFlatBuffer<T>(t, &fbb));
return FlatbufferDetachedBuffer<T>(fbb.Release());
}