more google merge fixes

This commit is contained in:
Derek Bailey
2022-04-19 14:35:20 -07:00
parent ccfb4c20bf
commit 9d45a64036
3 changed files with 4 additions and 2 deletions

View File

@@ -739,7 +739,7 @@ class FlatBufferBuilder {
/// @return Returns a typed `Offset` into the serialized data indicating
/// where the vector is stored.
template<typename StringType = std::string,
typename Alloc = std::allocator<std::string>>
typename Alloc = std::allocator<StringType>>
Offset<Vector<Offset<String>>> CreateVectorOfStrings(
const std::vector<StringType, Alloc> &v) {
return CreateVectorOfStrings(v.cbegin(), v.cend());