Merge remote-tracking branch 'refs/remotes/google/master' into key (98f9af8e) · Commits · fuchsia-mirror / fuchsia.googlesource.com-third_party-flatbuffers · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

fuchsia.googlesource.com-third_party-flatbuffers
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

98f9af8e

Commit 98f9af8e authored 8 years ago by TGIshib

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/google/master' into key

# Conflicts:
#	src/idl_gen_general.cpp

parents 1a18122e 481d332e

Loading

Changes 25

Hide whitespace changes

Inline Side-by-side

Showing

CMake/PackageDebian.cmake 57 additions, 0 deletions

CMake/PackageDebian.cmake
CMakeLists.txt 5 additions, 0 deletions

CMakeLists.txt
docs/source/doxyfile 1 addition, 1 deletion

docs/source/doxyfile
grpc/src/compiler/cpp_generator.cc 27 additions, 26 deletions

grpc/src/compiler/cpp_generator.cc
grpc/src/compiler/cpp_generator.h 9 additions, 72 deletions

grpc/src/compiler/cpp_generator.h
grpc/src/compiler/schema_interface.h 108 additions, 0 deletions

grpc/src/compiler/schema_interface.h
include/flatbuffers/flatbuffers.h 0 additions, 5 deletions

include/flatbuffers/flatbuffers.h
include/flatbuffers/idl.h 3 additions, 1 deletion

include/flatbuffers/idl.h
java/com/google/flatbuffers/FlatBufferBuilder.java 36 additions, 0 deletions

java/com/google/flatbuffers/FlatBufferBuilder.java
java/com/google/flatbuffers/Table.java 16 additions, 6 deletions

java/com/google/flatbuffers/Table.java
net/FlatBuffers/ByteBuffer.cs 17 additions, 5 deletions

net/FlatBuffers/ByteBuffer.cs
pom.xml 1 addition, 1 deletion

pom.xml
samples/sample_text.cpp 4 additions, 1 deletion

samples/sample_text.cpp
src/flatc.cpp 2 additions, 2 deletions

src/flatc.cpp
src/idl_gen_cpp.cpp 21 additions, 21 deletions

src/idl_gen_cpp.cpp
src/idl_gen_general.cpp 23 additions, 28 deletions

src/idl_gen_general.cpp
src/idl_gen_go.cpp 0 additions, 3 deletions

src/idl_gen_go.cpp
src/idl_gen_grpc.cpp 10 additions, 10 deletions

src/idl_gen_grpc.cpp
src/idl_gen_text.cpp 84 additions, 45 deletions

src/idl_gen_text.cpp
tests/FlatBuffers.Test/ByteBufferTests.cs 18 additions, 0 deletions

tests/FlatBuffers.Test/ByteBufferTests.cs

with 442 additions and 227 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment