TGIshib [Thu, 28 Jul 2016 18:58:45 +0000 (21:58 +0300)]
Merge remote-tracking branch 'refs/remotes/google/master'
Wouter van Oortmerssen [Thu, 28 Jul 2016 00:34:00 +0000 (17:34 -0700)]
Added AppVeyor CI.
Change-Id: I01cf630026e25382b585785b471bad21153338f6
Wouter van Oortmerssen [Thu, 28 Jul 2016 00:20:35 +0000 (17:20 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Thu, 28 Jul 2016 00:10:37 +0000 (17:10 -0700)]
Removed pre-made VS2010 and XCode projects.
CMake is now required on all platforms.
Change-Id: Iad81d9244a05ed70ce8b8860d6b729a873f137c1
Tested: on Windows and OS X.
Wouter van Oortmerssen [Wed, 27 Jul 2016 20:41:22 +0000 (13:41 -0700)]
Merge pull request #3965 from Bklyn/master
Fix docs for object API usage
Caleb Epstein [Wed, 27 Jul 2016 20:02:49 +0000 (16:02 -0400)]
Fix docs for object API usage
Wouter van Oortmerssen [Wed, 27 Jul 2016 19:29:21 +0000 (12:29 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers
Jason Sanmiya [Sat, 23 Jul 2016 02:04:23 +0000 (19:04 -0700)]
Fix Mac build.
The new line in the set(CMAKE_CXX_FLAGS...) line was getting insert
verbatim into the Makefile. Makefiles don't like new lines in their
assignment operators.
The newline escape fix works for CMake 3.0 and above, but since
we support 2.x, we need to use the legacy solution, which is to
split into two separate statements.
Tested: cmake -G"Unix Makefiles" works now on Mac.
Change-Id: I6f4655981b85087c4760c3d26ed0c97c4469ba93
Robert [Tue, 26 Jul 2016 03:44:33 +0000 (20:44 -0700)]
Merge pull request #210 from splhack/add_enumnames_to_go
Add EnumNames to Go code
Kazuki Sakamoto [Tue, 26 Jul 2016 02:37:16 +0000 (19:37 -0700)]
Add EnumNames to Go code
Tested: on Darwin
Wouter van Oortmerssen [Mon, 25 Jul 2016 23:26:50 +0000 (16:26 -0700)]
Pulled out EndianSwap into its own function.
Change-Id: I4a587102db8c435b739c92b6c464c94c4ea1fe42
Wouter van Oortmerssen [Mon, 25 Jul 2016 21:43:41 +0000 (14:43 -0700)]
Fixed reflection.h not modifying certain table configurations.
It would write 64bits offsets instead of 32bit ones, and update
the vtable pointer before the fields were processed.
Change-Id: I0c0fa942bbd3b42839294f5653ba8fa048612624
Tested: on Linux.
Wouter van Oortmerssen [Mon, 25 Jul 2016 21:42:58 +0000 (14:42 -0700)]
Adding missing generated code from recent commits.
Also updated generated_code.sh to prevent this from happening in
the future.
Change-Id: Ib282e9b6c762a79d4b4e09bee06b14781cd2a4c1
TGIshib [Mon, 25 Jul 2016 21:07:23 +0000 (00:07 +0300)]
Merge remote-tracking branch 'refs/remotes/google/master'
Raman [Mon, 25 Jul 2016 21:04:01 +0000 (23:04 +0200)]
Update idl_gen_general.cpp
Wouter van Oortmerssen [Mon, 25 Jul 2016 17:47:46 +0000 (10:47 -0700)]
Merge pull request #3935 from kazimuth/jsns
Add @namespace annotation to namespaces in javascript
Raman [Sat, 23 Jul 2016 12:17:28 +0000 (15:17 +0300)]
Merge pull request #3 from TGIshib/key
Update idl_gen_general.cpp
Raman [Sat, 23 Jul 2016 12:16:30 +0000 (14:16 +0200)]
Update idl_gen_general.cpp
Wouter van Oortmerssen [Fri, 22 Jul 2016 22:46:26 +0000 (15:46 -0700)]
Fixed missing \ in CMakeLists.txt that broke the build
Robert [Fri, 22 Jul 2016 22:12:35 +0000 (15:12 -0700)]
Merge pull request #363 from danring/fix-341
Emit GetRootAs methods for all types in Go and Python
Wouter van Oortmerssen [Thu, 21 Jul 2016 01:17:33 +0000 (18:17 -0700)]
Fixed conversion warning in generated code.
Wouter van Oortmerssen [Thu, 21 Jul 2016 01:13:11 +0000 (18:13 -0700)]
Fixed VS2010 build
Wouter van Oortmerssen [Thu, 21 Jul 2016 00:24:50 +0000 (17:24 -0700)]
Added way to test two schemas for safe evolution.
Change-Id: I1dfc867e6df5932ab61dad431eb3cb02f15d04df
Tested: on Linux.
Bug:
30202327
Wouter van Oortmerssen [Thu, 21 Jul 2016 00:55:05 +0000 (00:55 +0000)]
Merge "This is a minimal amount of #ifdef's to make stlport work." into ub-games-master
Wouter van Oortmerssen [Thu, 21 Jul 2016 00:52:41 +0000 (17:52 -0700)]
Fixed unused parameter warning.
Change-Id: I7a2576c6f366b89ef3e1f83941f90294ca7a07fd
Wouter van Oortmerssen [Thu, 21 Jul 2016 00:43:03 +0000 (17:43 -0700)]
Added missing Go generated files.
Change-Id: I9d738e84ab2e01ec117c825ade44cc865cf5f1c2
Wouter van Oortmerssen [Thu, 21 Jul 2016 00:41:36 +0000 (17:41 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers into grpc2
Wouter van Oortmerssen [Wed, 20 Jul 2016 21:18:09 +0000 (14:18 -0700)]
This is a minimal amount of #ifdef's to make stlport work.
Minimal, in the sense that this will only allow flatbuffers.h +
generated code to work. Everything else (tests, parsing, reflection
etc.) may still not compile with stlport.
Functionality has been reduced, some utility functions are not
available.
Tested: on Linux (no stlport), Android (stlport).
Change-Id: I3f8b6a88258c07d78964dd455fb9f99f65266301
Wouter van Oortmerssen [Sat, 2 Jul 2016 01:08:51 +0000 (18:08 -0700)]
Added optional object based API for C++.
Change-Id: If927f3ea3fb3723088fa287f24bdd1ad43c8d1d1
Tested: on Linux.
Wouter van Oortmerssen [Wed, 20 Jul 2016 17:51:30 +0000 (10:51 -0700)]
Merge pull request #259 from kadirahq/golang-mutators
(Go) Add setter methods for scalar values.
Wouter van Oortmerssen [Wed, 20 Jul 2016 17:48:37 +0000 (10:48 -0700)]
Xcode fixes
Wouter van Oortmerssen [Wed, 20 Jul 2016 17:41:26 +0000 (10:41 -0700)]
VS2010 fixes
Muhammed Thanish [Wed, 20 Jul 2016 17:28:22 +0000 (22:58 +0530)]
Implement mutators for Go
Wouter van Oortmerssen [Wed, 20 Jul 2016 17:01:32 +0000 (10:01 -0700)]
Merge pull request #3954 from yakiro/master
fixed ArrayOutOfBoundsException in java example
Wouter van Oortmerssen [Wed, 20 Jul 2016 16:40:50 +0000 (09:40 -0700)]
Merge pull request #3951 from devantoine/patch-2
[PHP] Fix typo
Yakir Buskilla [Wed, 20 Jul 2016 07:46:43 +0000 (10:46 +0300)]
fixed ArrayOutOfBoundsException in java example
Antoine Descamps [Tue, 19 Jul 2016 10:22:37 +0000 (12:22 +0200)]
Fix typo
Related to https://github.com/google/flatbuffers/pull/3904#issuecomment-
224724181
Wouter van Oortmerssen [Tue, 19 Jul 2016 00:35:43 +0000 (17:35 -0700)]
Merge pull request #3904 from devantoine/patch-1
Fix typo
Wouter van Oortmerssen [Mon, 18 Jul 2016 21:13:36 +0000 (14:13 -0700)]
Merge pull request #3902 from rgilles/master
Create a maven like project structure for java development + OSGi + generation for test
Wouter van Oortmerssen [Mon, 18 Jul 2016 21:12:03 +0000 (14:12 -0700)]
Merge pull request #3915 from Lakedaemon/clangFormat
clang formating header and code generators for cpp, general, js, php
Wouter van Oortmerssen [Mon, 18 Jul 2016 18:12:43 +0000 (11:12 -0700)]
Merge pull request #3948 from mortonfox/patch-1
Fix link to CONTRIBUTING
Morton Fox [Sat, 16 Jul 2016 04:26:50 +0000 (00:26 -0400)]
Fix link to CONTRIBUTING
lakedaemon [Fri, 15 Jul 2016 13:35:24 +0000 (15:35 +0200)]
clang formating cpp code generator and add missing generated classes
lakedaemon [Fri, 15 Jul 2016 13:21:09 +0000 (15:21 +0200)]
clangFormating base class
Romain Gilles [Fri, 15 Jul 2016 12:34:56 +0000 (14:34 +0200)]
Added OSGi header generation for maven project.
This allow jar generated with maven to be used in OSGi environment.
Romain Gilles [Fri, 15 Jul 2016 12:27:31 +0000 (14:27 +0200)]
Merge branch 'master' of github.com:google/flatbuffers
Wouter van Oortmerssen [Thu, 14 Jul 2016 17:55:22 +0000 (10:55 -0700)]
Merge pull request #3905 from bog-dan-ro/master
Verifier computes the buffersize, useful when streaming multiple flatbuffers
Wouter van Oortmerssen [Thu, 14 Jul 2016 17:47:34 +0000 (10:47 -0700)]
Merge pull request #3939 from TGIshib/hex-bug
Fixed bug with negative hex constants (2).
BogDan Vatra [Thu, 14 Jul 2016 17:15:06 +0000 (20:15 +0300)]
Verify everything in one shot
BogDan Vatra [Thu, 14 Jul 2016 17:15:44 +0000 (20:15 +0300)]
Verifier computes the buffersize, useful for streaming
Close #3898
Raman [Thu, 14 Jul 2016 16:51:23 +0000 (18:51 +0200)]
Update test.cpp
Raman [Thu, 14 Jul 2016 08:30:06 +0000 (10:30 +0200)]
Update test.cpp
Raman [Thu, 14 Jul 2016 08:01:08 +0000 (10:01 +0200)]
Update test.cpp
Wouter van Oortmerssen [Wed, 13 Jul 2016 18:17:12 +0000 (11:17 -0700)]
Merge pull request #3943 from bog-dan-ro/crash
Don't crash if str is null
BogDan Vatra [Wed, 13 Jul 2016 18:04:26 +0000 (21:04 +0300)]
Don't crash if str is null
Is useful especially when we want to create a string from another message string that might be null.
Wouter van Oortmerssen [Wed, 13 Jul 2016 17:00:56 +0000 (10:00 -0700)]
Merge pull request #3940 from rushabhy/patch-1
Rename CONTRIBUTING to CONTRIBUTING.md
Rushabh Yapuram [Wed, 13 Jul 2016 02:27:36 +0000 (07:57 +0530)]
Rename CONTRIBUTING to CONTRIBUTING.md
Raman [Tue, 12 Jul 2016 17:55:35 +0000 (19:55 +0200)]
Update test.cpp
Raman [Tue, 12 Jul 2016 17:52:16 +0000 (20:52 +0300)]
Merge pull request #2 from TGIshib/hex-bug
Fixed bug with negative hex constants (2).
Raman [Tue, 12 Jul 2016 17:47:53 +0000 (19:47 +0200)]
Update idl_parser.cpp
Wouter van Oortmerssen [Mon, 11 Jul 2016 17:55:17 +0000 (10:55 -0700)]
Merge pull request #3923 from daksenik/master
Fixed operator++. Added CreateXXX for vector types.
daksenik [Mon, 11 Jul 2016 17:27:38 +0000 (20:27 +0300)]
Fixed spaces. Removed redundant == nullptr. Vectors pointers made const.
Wouter van Oortmerssen [Mon, 11 Jul 2016 16:47:31 +0000 (09:47 -0700)]
Merge pull request #3924 from TGIshib/master
Added --escape-proto-identifiers command-line option.
Wouter van Oortmerssen [Mon, 11 Jul 2016 16:20:43 +0000 (09:20 -0700)]
Merge pull request #3931 from jonathantullett/java_public_access
Fix for issue #3922
James Gilles [Mon, 11 Jul 2016 05:13:47 +0000 (01:13 -0400)]
js:add @namespace annotation to namespaces
Raman [Sat, 9 Jul 2016 11:33:30 +0000 (13:33 +0200)]
Update idl_gen_fbs.cpp
Raman [Sat, 9 Jul 2016 11:32:45 +0000 (13:32 +0200)]
Update flatc.cpp
Raman [Sat, 9 Jul 2016 10:57:07 +0000 (12:57 +0200)]
Update idl_parser.cpp
Raman [Sat, 9 Jul 2016 10:51:06 +0000 (12:51 +0200)]
Update test.cpp
Raman [Sat, 9 Jul 2016 10:47:14 +0000 (12:47 +0200)]
Update flatc.cpp
Raman [Sat, 9 Jul 2016 10:40:50 +0000 (12:40 +0200)]
Update idl_gen_fbs.cpp
Raman [Sat, 9 Jul 2016 10:28:02 +0000 (12:28 +0200)]
Update idl.h
daksenik [Sat, 9 Jul 2016 10:00:21 +0000 (13:00 +0300)]
Added function GenSimpleParam. Tests added.
Jonathan Tullett [Sat, 9 Jul 2016 08:16:26 +0000 (09:16 +0100)]
Fix for issue #3922
Also, clean up redundant ';' at end of java classes.
Wouter van Oortmerssen [Fri, 8 Jul 2016 21:24:08 +0000 (14:24 -0700)]
Merge pull request #3929 from Lakedaemon/fixForMake
same fix for general code generator
lakedaemon [Fri, 8 Jul 2016 20:51:31 +0000 (22:51 +0200)]
same fix for general code generator
Wouter van Oortmerssen [Fri, 8 Jul 2016 20:37:05 +0000 (13:37 -0700)]
Merge pull request #3928 from Lakedaemon/fixForMake
Fix for make
lakedaemon [Fri, 8 Jul 2016 20:02:47 +0000 (22:02 +0200)]
fix missing space (clang format)
lakedaemon [Fri, 8 Jul 2016 20:00:15 +0000 (22:00 +0200)]
fixed initialization of member var for old make (hopefully)
daksenik [Fri, 8 Jul 2016 09:35:57 +0000 (12:35 +0300)]
New CreateXXX (with vectors and strings) calls old CreateXXX (with offsets).
Raman [Tue, 5 Jul 2016 21:23:17 +0000 (23:23 +0200)]
Update idl_gen_fbs.cpp
Raman [Tue, 5 Jul 2016 20:26:21 +0000 (22:26 +0200)]
Update idl_gen_fbs.cpp
Raman [Tue, 5 Jul 2016 20:24:21 +0000 (22:24 +0200)]
Update flatc.cpp
Raman [Tue, 5 Jul 2016 20:20:57 +0000 (22:20 +0200)]
Update idl_parser.cpp
Romain Gilles [Tue, 5 Jul 2016 12:29:12 +0000 (14:29 +0200)]
Move maven `pom.xml` from the java folder to the root folder.
This avoid to put the pom.xml file into the source directory. Normally the pom file is in a parent (/parent) folder and it is not mixed with the java source code.
An other thing is: this will make import of the project more easy from a IDE.
The side effect is that the target folder where maven build artifacts will move from the <flatbuffers>/java/target to <flatbuffers>/target therefore the gitignore file has been updated in consequences.
Romain Gilles [Tue, 5 Jul 2016 09:40:33 +0000 (11:40 +0200)]
Merge branch 'master' of github.com:google/flatbuffers
Romain Gilles [Tue, 5 Jul 2016 09:38:17 +0000 (11:38 +0200)]
Revert "Create a maven like project structure for java development. Make it OSGi compliant. Generate the flatbuffers code for testing (example)."
This reverts commit
9875b0e0f8af5781a793fb93807641c9cebfb903.
Raman [Mon, 4 Jul 2016 20:58:58 +0000 (22:58 +0200)]
Update flatc.cpp
Raman [Mon, 4 Jul 2016 19:55:44 +0000 (21:55 +0200)]
Update test.cpp
Raman [Mon, 4 Jul 2016 19:51:34 +0000 (21:51 +0200)]
Update flatc.cpp
Raman [Mon, 4 Jul 2016 19:41:01 +0000 (21:41 +0200)]
Update idl.h
Raman [Mon, 4 Jul 2016 19:37:50 +0000 (21:37 +0200)]
Update flatc.cpp
Raman [Mon, 4 Jul 2016 19:34:42 +0000 (21:34 +0200)]
Update idl_gen_fbs.cpp
daksenik [Mon, 4 Jul 2016 14:37:23 +0000 (17:37 +0300)]
Fixed operator++. Added CreateXXX for vector types.
daksenik [Mon, 4 Jul 2016 13:34:41 +0000 (16:34 +0300)]
Fixed operator++. Added CreateXXX for vector types.
Wouter van Oortmerssen [Fri, 1 Jul 2016 17:15:54 +0000 (10:15 -0700)]
Merge pull request #3921 from LouisCAD/master
Fixed typo
Wouter van Oortmerssen [Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)]
Merge pull request #3920 from love-ginger/master
Fix mac build error
Louis Cognault [Fri, 1 Jul 2016 15:22:36 +0000 (17:22 +0200)]
Fixed typo
is => it
吴凡 [Fri, 1 Jul 2016 03:17:03 +0000 (11:17 +0800)]
Fix some error
吴凡 [Fri, 1 Jul 2016 03:03:25 +0000 (11:03 +0800)]
Sync from upstream