Skip to content

Commit 79dfee4

Browse files
committed
Merge branch '7-update-flatbuffers' into 'dev'
Resolve "Update Flatbuffers to v23.5.26 / AddElement instead of TrackField/PushElement" See merge request objectbox/objectbox-generator!6
2 parents 4f3e037 + 6323a86 commit 79dfee4

131 files changed

Lines changed: 31199 additions & 13460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/objectbox/objectbox-generator
22

33
go 1.11
44

5-
require github.com/google/flatbuffers v2.0.0+incompatible
5+
require github.com/google/flatbuffers v23.5.26+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI=
2-
github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
1+
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
2+
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=

internal/generator/c/templates/binding-cpp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void {{$entity.Meta.CppNamespacePrefix}}{{$entity.Meta.CppName}}::_OBX_MetaInfo:
5252
{{range $property := $entity.Properties}}
5353
{{- if $property.Meta.Optional}}if (object.{{$property.Meta.CppName}}) {{end}}
5454
{{- if $property.Meta.FbOffsetFactory}}fbb.AddOffset({{$property.FbvTableOffset}}, offset{{$property.Meta.CppName}});
55-
{{- else}}fbb.TrackField({{$property.FbvTableOffset}}, fbb.PushElement<{{$property.Meta.CppFbType}}>({{template "field-value" $property.Meta}}{{if eq "bool" $property.Meta.CppType}} ? 1 : 0{{end}}));
55+
{{- else}}fbb.AddElement({{$property.FbvTableOffset}}, {{template "field-value" $property.Meta}}{{if eq "bool" $property.Meta.CppType}} ? 1 : 0{{end}});
5656
{{- end}}
5757
{{end -}}
5858
flatbuffers::Offset<flatbuffers::Table> offset;

internal/generator/flatbuffersc/reflection/AdvancedFeatures.go

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/generator/flatbuffersc/reflection/BaseType.go

Lines changed: 60 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/generator/flatbuffersc/reflection/Enum.go

Lines changed: 80 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)