Wouter van Oortmerssen [Tue, 3 Jan 2017 22:56:44 +0000 (14:56 -0800)]
Updated version to 1.5
Change-Id: I34007829cdd3ad024df21f68bb369016d5d21131
Yonggang Li [Tue, 3 Jan 2017 21:54:15 +0000 (13:54 -0800)]
fix memory leak (#4126)
CarsarSky [Wed, 28 Dec 2016 19:50:41 +0000 (03:50 +0800)]
Fix C++ gRPC test with streaming method (#4123)
Wouter van Oortmerssen [Thu, 22 Dec 2016 02:06:10 +0000 (18:06 -0800)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Thu, 22 Dec 2016 02:04:31 +0000 (18:04 -0800)]
Fixed empty structs generating illegal constructor in C++.
Change-Id: I60418d597b497c3cfa655ad76b3128351e9139f2
Ankur Dave [Thu, 22 Dec 2016 01:49:45 +0000 (17:49 -0800)]
Fix call to Verifier::VerifyBuffer from BufferRef (#4124)
3a1f776132cf9377e3a85a888e6ff2bc12c7248c added a required identifier parameter
to Verifier::VerifyBuffer but did not update the templated call site in
BufferRef. This causes errors like the following when trying to instantiate the
call site by calling BufferRef::Verify():
include/flatbuffers/flatbuffers.h: In instantiation of ‘bool flatbuffers::BufferRef<T>::Verify() [with T = MyType]’:
MyApp.cpp:16:3: required from here
include/flatbuffers/flatbuffers.h:1421:37: error: no matching function for call to ‘flatbuffers::Verifier::VerifyBuffer()’
return verifier.VerifyBuffer<T>();
^
include/flatbuffers/flatbuffers.h:1421:37: note: candidate is:
include/flatbuffers/flatbuffers.h:1352:29: note: template<class T> bool flatbuffers::Verifier::VerifyBuffer(const char*)
template<typename T> bool VerifyBuffer(const char *identifier) {
^
include/flatbuffers/flatbuffers.h:1352:29: note: template argument deduction/substitution failed:
include/flatbuffers/flatbuffers.h:1421:37: note: candidate expects 1 argument, 0 provided
return verifier.VerifyBuffer<T>();
^
This commit fixes the BufferRef call site by adding a nullptr argument.
Zarian Waheed [Thu, 22 Dec 2016 01:48:21 +0000 (17:48 -0800)]
Added helper methods to access struct through reflection. (#4120)
* Added helper methods to access struct through reflection. Also added unit test for it.
* Added a TODO comment to check for the is_struct flag.
Wouter van Oortmerssen [Thu, 22 Dec 2016 01:45:27 +0000 (17:45 -0800)]
Fixed more Windows build errors.
Change-Id: I556e1c103e8501dc144b16c8698463253de6f4fb
Wouter van Oortmerssen [Thu, 22 Dec 2016 00:16:52 +0000 (16:16 -0800)]
Fixed Windows compiler warning.
Change-Id: I12b31227d4545a8897f638754d6a9ccd029f177e
wvo [Wed, 21 Dec 2016 21:57:10 +0000 (21:57 +0000)]
Go related style fixes.
Change-Id: Ie854ace69a21ef685e1ade5584f9d9ce4e8b41f1
Wouter van Oortmerssen [Tue, 20 Dec 2016 01:04:35 +0000 (17:04 -0800)]
Fixed Windows build errors.
Change-Id: I11548bfa3cfe307598eb59c56412974c349d614d
Wouter van Oortmerssen [Tue, 20 Dec 2016 00:28:06 +0000 (16:28 -0800)]
Added missing generated code from previous commits.
Change-Id: Id7053e4cb5a085a4b047c86ff1f2269329ff7f54
Wouter van Oortmerssen [Tue, 20 Dec 2016 00:26:57 +0000 (16:26 -0800)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Tue, 20 Dec 2016 00:25:31 +0000 (00:25 +0000)]
Merge "Documentation improvements: style guide & guide lines." into ub-games-master
Wouter van Oortmerssen [Fri, 16 Dec 2016 23:59:05 +0000 (15:59 -0800)]
Documentation improvements: style guide & guide lines.
Bug:
22346508
Change-Id: I3f6e6b2811adaaf9d79faca8cdd00af3927299b5
Wouter van Oortmerssen [Mon, 19 Dec 2016 23:21:41 +0000 (15:21 -0800)]
Add default values (if they exist) to native tables.
From cl/
142307012.
Change-Id: I54d550573f6506b92ad18e7cc90bcd8589259e52
Wouter van Oortmerssen [Mon, 19 Dec 2016 23:21:08 +0000 (15:21 -0800)]
Add ::Set function to Unions to make memory ownership clear.
Unions own the NativeTable* value member because they need to destroy them
when the Union goes out of scope. Currently, the data is destroyed by calling
delete, which means that the member needs to be allocated with new. However,
making the allocation the responsibility of the client and the destruction
the responsibility of the Union can lead to potential errors. Adding a
Set function will ensure that the memory is allocated correctly so that it
can be deleted later.
From cl/
142161569.
Change-Id: I4605f26d2749164819bfae0140e5fae08442b50a
Zarian Waheed [Fri, 16 Dec 2016 16:46:30 +0000 (08:46 -0800)]
Changes for verifying a buffer dynamically using reflection. (#4102)
* Changes for verifying a buffer dynamically using reflection.
* Fixing build issues on linux and applied code reformatting.
* Fixing the file order in cmake file that was messing up the macro based code inclusion.
Added tests for reflection based verification.
* Changes for verifying a buffer dynamically using reflection.
Fixing build issues on linux and applied code reformatting.
Fixing the file order in cmake file that was messing up the macro based code inclusion.
Added tests for reflection based verification.
* Incorporated the code review changes that were requested:
1. Changed the Verify function signature.
2. Changed the variable names to use snake_case.
3. Added better comments.
4. Refactored duplicate code.
5. Changed the verifier class so that it has the same size when compiled with or without FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE macro.
* Setting FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE and FLATBUFFERS_DEBUG_VERIFICATION_FAILURE through cmake for flattests so that it gets propagted to all translation units of flattests.
* Making the Verifier struct fields the same in all cases. Also reverting the target_compile_definitions change in cmake file because build machine on travis does not have cmake version 3.0 or higher which was the version when target_compile_definitions was added in cmake.
* Defining macros through cmake in a portable way using functions that are available in cmake 2.8.
krupnov [Fri, 16 Dec 2016 16:37:04 +0000 (20:37 +0400)]
random access iterator for vector added (#4119)
* random access iterator for vector added
* Style changes
Wouter van Oortmerssen [Wed, 14 Dec 2016 18:35:26 +0000 (10:35 -0800)]
Fixed JS outputting helper for Int64Array.
Change-Id: I7d23fa3416feb78ea18d2c451e7b4e1d9be11bfc
Wouter van Oortmerssen [Wed, 14 Dec 2016 18:32:44 +0000 (10:32 -0800)]
Made GRPC generator missing into a warning.
Change-Id: Iceb1f5b78cff6227905b8a23eb70e9ef6ce909ed
Wouter van Oortmerssen [Mon, 12 Dec 2016 23:43:49 +0000 (15:43 -0800)]
Improving AppVeyor CI with other languages.
Change-Id: Iff630905b5f90814c5f728e3c0e10f7fcd67c7fe
Ricardo Quesada [Mon, 12 Dec 2016 22:12:56 +0000 (14:12 -0800)]
add weapon + equipment to json example (#4114)
update json with documentation
removed comments
Robert [Fri, 9 Dec 2016 22:29:57 +0000 (14:29 -0800)]
Merge pull request #4112 from manolama/tweaks
Restore the ''import "unsafe'' removed in
36daedf35fd0cc2ad0e5e24d187…
Manolama [Fri, 9 Dec 2016 06:15:20 +0000 (22:15 -0800)]
Restore the ''import "unsafe'' removed in
36daedf35fd0cc2ad0e5e24d187b25613c13660e.
This was causing build failures with tools dependent on Flatbuffers in Go.
E.g.
go/src/github.com/google/flatbuffers/go/sizes.go:50: undefined: unsafe in unsafe.Pointer
Robert [Wed, 7 Dec 2016 22:17:30 +0000 (14:17 -0800)]
Create basic issue template (#4107)
* Create basic issue template
* Update ISSUE_TEMPLATE.md
Robert [Wed, 7 Dec 2016 19:51:11 +0000 (11:51 -0800)]
Merge pull request #3791 from mmastrac/master
Avoid unsafe when sizing types
Robert [Wed, 7 Dec 2016 19:17:55 +0000 (11:17 -0800)]
Merge pull request #3977 from gonzaloserrano/feature/go-generic-deserialitzation
Add a generic way to deserialize a flatbuffer in Go.
Ronak Jain [Mon, 5 Dec 2016 21:20:38 +0000 (02:50 +0530)]
Support for Golang GRPC (Experimental) (#4082)
* support for grpc golang
* refactored grpc go generator
* added grpc-go test and refactored
* refactored idl_gen_grpc.cpp
* fixed grpc generate method name
* refactored flatc and fixed line length issue
* added codec to go lib and fixed formatting issues
* fixed spacing issues
Wouter van Oortmerssen [Fri, 2 Dec 2016 22:25:39 +0000 (14:25 -0800)]
Adds typedefs and functions to help write generic code.
The following changes have been made to the C++ codegen to enable writing generic code
that uses the Table and NativeTable types.
- Adds TableType and NativeTableType typedefs to NativeTable and Table structs.
- Adds GetFullyQualifiedName() to NativeTables if --gen-name-strings is set.
- Adds a static Pack function to Tables that simply calls the global CreateX functions.
See cr/
140391505 as an example of improved usage.
From cl/
140529288.
Change-Id: Idec137c16129e15c1783f94fabdcea24aeeaaef6
Wouter van Oortmerssen [Fri, 2 Dec 2016 22:25:08 +0000 (14:25 -0800)]
Allows structs to be stored directly as member variables.
Introduce a "native_inline" attribute that can be applied on fields that are structs.
This results in NativeTable code generation that sets the struct "inline" rather than
storing it in a pointer.
From cl/
140527470.
Change-Id: I208724f552b8b921b20923e0bf82f42cb3582416
Wouter van Oortmerssen [Mon, 21 Nov 2016 23:20:33 +0000 (15:20 -0800)]
Merge branch 'master' of https://github.com/google/flatbuffers
Change-Id: I02b00b22cdd2d1bd32de3273ff69185c9b0f4e5b
The Gitter Badger [Wed, 2 Nov 2016 21:05:31 +0000 (16:05 -0500)]
Add Gitter badge (#4075)
benssson [Wed, 26 Oct 2016 17:29:36 +0000 (18:29 +0100)]
Fixed javascript helper for typed arrays of scalars not taking into (#4068)
account underlying buffer's byte offset.
Antoine Descamps [Wed, 16 Nov 2016 17:54:57 +0000 (18:54 +0100)]
[PHP] Use mb_detect_encoding when available (#3952)
I've faced an issue where I want to serialize UTF-8 emojis and FlatBufferBuilder::is_utf8 would return false on them.
I was not able to add the corresponding hexadecimal code because I don't understand how the whole thing works but what i've done is using the `mb_detect_encoding` function which handles correctly all supposed UTF-8 characters.
garretmcgraw [Wed, 9 Nov 2016 22:38:48 +0000 (17:38 -0500)]
Making flatbuffers JSON parsing deal with unexpected null values when unknown JSON is allowed. (#4083)
Michael Paulson [Mon, 7 Nov 2016 18:27:26 +0000 (10:27 -0800)]
chore(lint) (#4079)
* chore(lint)
I accidentally let 2 pieces of lint in with my generated code.
* fix(generate-code): I did not generate all the required code for tests.
Wouter van Oortmerssen [Mon, 7 Nov 2016 18:09:42 +0000 (10:09 -0800)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Mon, 7 Nov 2016 17:51:28 +0000 (09:51 -0800)]
Fixes to support GCC 4.4.7
Fixed generation of a trailing comma and removed unnecessary use of a lambda.
Change-Id: I9993f6eb83e2ebc36fc40295a2059c340c1fbe03
Tested: on Linux.
The Gitter Badger [Wed, 2 Nov 2016 21:05:31 +0000 (16:05 -0500)]
Add Gitter badge (#4075)
benssson [Wed, 26 Oct 2016 17:29:36 +0000 (18:29 +0100)]
Fixed javascript helper for typed arrays of scalars not taking into (#4068)
account underlying buffer's byte offset.
Wouter van Oortmerssen [Mon, 24 Oct 2016 17:29:09 +0000 (10:29 -0700)]
Change docs to not encourage use of 1 byte buffers.
Change-Id: Ib0b1692044f35e374a0f7c0359c94319f4a25619
Wouter van Oortmerssen [Sat, 22 Oct 2016 00:35:41 +0000 (17:35 -0700)]
Fixed STLPort error for missing vector::data()
Change-Id: I06fb61edf018adf0f26a81de4596b4972226e466
Tested: on Android.
Bug:
30263829
Wouter van Oortmerssen [Fri, 21 Oct 2016 23:57:50 +0000 (16:57 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Fri, 21 Oct 2016 22:22:14 +0000 (15:22 -0700)]
Made nesting vs inline clearer in the docs.
Also fixed structs not being created inline in the tutorial,
which would actually have bad consequences if used.
Change-Id: Idce215c61a1b24a297cee76f625052bb2722e970
cajun-rat [Fri, 21 Oct 2016 21:52:42 +0000 (23:52 +0200)]
Fix Closure Compiler warnings (#4067)
* Make parameter order in jsdocs match function
When the order doesn't match the Google Closure Javascript compiler generates
warnings
* Prefix optional parameters with opt_
The Closure Compiler emits warnings when this isn't the case
Baptiste Lepilleur [Fri, 21 Oct 2016 21:27:15 +0000 (23:27 +0200)]
Java: fix unsigned default value code generation and add 'L' suffix for long default value (#4051)
* Java: emit "signed" equivalent of unsigned default value in generated code and add "L" suffix to long default value.
* Updated generated code
* Only convert ulong to "signed" equivalent. ubyte and ushort don't need specific handling as "user facing" type is int. uint need 'L' suffix as "user facing" type is long.
* Added missing cast to primitive type of default value which is in "user facing" type in builder.add<type>() calls.
* Do not cast default value to actual type in C#.
Wouter van Oortmerssen [Tue, 18 Oct 2016 01:02:19 +0000 (18:02 -0700)]
Added functionality to obtain a buffer pointer from a root.
Change-Id: Ia63e41d0304e8668ea4ce09a4c31dd999eb96994
Tested: on Linux.
Bug:
32218623
Wouter van Oortmerssen [Mon, 17 Oct 2016 22:04:12 +0000 (15:04 -0700)]
Fixed lambda return value error on VS2010.
Change-Id: I6d0e8469bfa5b4c8a3f1cb119e186f4cf62c76ae
Wouter van Oortmerssen [Mon, 17 Oct 2016 20:06:11 +0000 (13:06 -0700)]
Fixed unused variable warnings, and made sure they are on.
Tested on Linux.
Change-Id: Ie18d6857f9ae8b1c3953a116203b4a8bb70a2ede
Wouter van Oortmerssen [Mon, 17 Oct 2016 18:53:28 +0000 (11:53 -0700)]
Fixed broken traits codegen for --scoped-enums.
Change-Id: I5f538d12ea37d11d2e239ddde32eefcdd91e347b
Tested: on Linux.
Wouter van Oortmerssen [Mon, 17 Oct 2016 17:46:14 +0000 (10:46 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers
Zhe Wang [Mon, 17 Oct 2016 16:57:46 +0000 (11:57 -0500)]
Add missing include (#4052)
Wouter van Oortmerssen [Wed, 12 Oct 2016 23:46:03 +0000 (16:46 -0700)]
Allow other pointer types than unique_ptr for object API.
Change-Id: I945890ce667a2f5a6c0495e78fd5326ed33b9914
Tested: on Linux.
Bug:
30135763
Wouter van Oortmerssen [Wed, 12 Oct 2016 23:05:57 +0000 (16:05 -0700)]
Fixed inconsistent use of namespace directory prefixing.
Change-Id: I2cab7a1f68b8e643c1057e0a366572421a94ed41
Tested: on Linux.
Wouter van Oortmerssen [Wed, 12 Oct 2016 21:51:02 +0000 (14:51 -0700)]
Fix lambda compilation error in VS.
Change-Id: I814008b6eeffec9bd4b8810e4b29db9ea6218bb8
Wouter van Oortmerssen [Wed, 12 Oct 2016 21:40:35 +0000 (14:40 -0700)]
Added missing generated code files.
Change-Id: Ifb977411b65f8721cf9db891d7a62798bd593c0c
Wouter van Oortmerssen [Wed, 12 Oct 2016 21:39:36 +0000 (14:39 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Tue, 11 Oct 2016 00:09:37 +0000 (17:09 -0700)]
Clarified tutorial w.r.t reading/writing buffers.
Bug:
30736848
Signed-off-by: Wouter van Oortmerssen <wvo@google.com>
Wouter van Oortmerssen [Mon, 10 Oct 2016 22:55:26 +0000 (15:55 -0700)]
Added support for size prefixed buffers.
These are useful for streaming FlatBuffers. The functionality
ensures proper alignment of the whole buffer.
Tested: on OS X.
Bug:
27123865
Change-Id: Ic7d75a618c1bb470ea44c4dcf202ff71f2b3f4f1
Signed-off-by: Wouter van Oortmerssen <wvo@google.com>
Wouter van Oortmerssen [Sat, 8 Oct 2016 00:07:39 +0000 (17:07 -0700)]
Fixed line numbers being off in multi-line comments.
Change-Id: I4c27892c249527980d8f52a2cca801dace70289f
Wouter van Oortmerssen [Wed, 5 Oct 2016 23:59:15 +0000 (16:59 -0700)]
External references for the object API thru a resolver function.
This allows hashed string fields to be used for lookup of any
C++ objects, a pointer to which are then stored in the object
besides the original hash for easy access.
Change-Id: I2247a13c349b905f1c54660becde2c818ad23e97
Tested: on Linux.
Bug:
30204449
Baptiste Lepilleur [Fri, 7 Oct 2016 16:42:29 +0000 (18:42 +0200)]
flatc java generator: namespace_test2.fbs is missing namespace prefix for referToA2() return type (#4040)
* Fix flatc generating incorrect java/c# code for namespace_test2.fbs. In code for TableInC, method referToA2() returned type SecondTableInA instead of NamespaceA.SecondTableInA.
* Updated generated code.
* Fixed indendation.
Andrew Hundt [Wed, 5 Oct 2016 20:20:30 +0000 (16:20 -0400)]
CMake now accepts external toolchain configuration (#4045)
Resolves #4038
Related to https://github.com/ruslo/hunter/pull/529
jbrads [Mon, 3 Oct 2016 21:14:25 +0000 (22:14 +0100)]
Generate type traits for unions to map a type to the corresponding u… (#4032)
* Generate type traits for unions to map a type to the corresponding union enum value.
* Fixed break with union enum type traits when type is in a namespace.
* Fixed spacing and variable names in type traits generation to match style guidelines.
* Fixed spacing in type traits generation to match style guidelines.
* Regenerated test schema header.
Wouter van Oortmerssen [Wed, 21 Sep 2016 18:06:34 +0000 (11:06 -0700)]
Merge pull request #4025 from paszea/reflection_fqn
serialize fully qualified struct & enum name in schema binary
Wouter van Oortmerssen [Mon, 19 Sep 2016 17:02:50 +0000 (10:02 -0700)]
Merge pull request #4027 from kimsin3003/csharp
Added IFlatbufferObject.cs file to project for .net.
FTT\kimsin [Mon, 19 Sep 2016 07:16:15 +0000 (16:16 +0900)]
Added IFlatbufferObject.cs file to project for .net.
Before edition, IFlatbufferObject.cs file wasn't in the project and building the project throwed error.
Jason Sanmiya [Thu, 15 Sep 2016 18:42:41 +0000 (18:42 +0000)]
Merge "Fix Windows warnings." into ub-games-master
Xun Liu [Wed, 14 Sep 2016 17:33:06 +0000 (10:33 -0700)]
serialize fully qualified struct & enum name in schema binary
Wouter van Oortmerssen [Wed, 14 Sep 2016 18:39:33 +0000 (11:39 -0700)]
Add a --conform-includes flag to specify include path for the conform schema
(mirrored from cl
133146933)
Change-Id: I61385289728777cae83139fef0229001d92382ca
Wouter van Oortmerssen [Wed, 14 Sep 2016 16:18:40 +0000 (09:18 -0700)]
Merge pull request #4021 from mogemimi/remove-extra-semi
Remove extra semicolon
mogemimi [Tue, 13 Sep 2016 11:59:57 +0000 (20:59 +0900)]
Remove extra semicolon
Wouter van Oortmerssen [Mon, 12 Sep 2016 17:35:16 +0000 (10:35 -0700)]
Merge pull request #4020 from albertofem/feature/allow_public_accessor_net
Allow access to underlying ByteBuffer in C#
Alberto Fernández [Fri, 9 Sep 2016 13:25:09 +0000 (15:25 +0200)]
Allow access to underlying ByteBuffer
Wouter van Oortmerssen [Sat, 10 Sep 2016 00:01:05 +0000 (17:01 -0700)]
Merge pull request #4004 from sahiljain/fix-3909
Return error when full string cannot be parsed into int
Sahil Jain [Fri, 26 Aug 2016 03:37:30 +0000 (23:37 -0400)]
Return error when full string cannot be parsed into int
Wouter van Oortmerssen [Fri, 9 Sep 2016 23:21:27 +0000 (16:21 -0700)]
Merge pull request #4017 from changnet/master
option to build shared library,defeault off
Wouter van Oortmerssen [Fri, 9 Sep 2016 22:28:37 +0000 (15:28 -0700)]
Merge pull request #4010 from rgilles/master
Isolate the complied Java classes into a target folder.
Jason Sanmiya [Thu, 8 Sep 2016 17:47:50 +0000 (10:47 -0700)]
Fix Windows warnings.
Cmake issued a warning when the variable is in quotation marks
in an if statement.
Visual Studio upgrades constants to int and issues a truncation
warning, so inserted a cast.
Change-Id: I60cdcb5c2565cd5e97f80b9c2ff1e6abc32b1deb
Tested: Builds without warning on VS2015.
Wouter van Oortmerssen [Wed, 7 Sep 2016 23:59:42 +0000 (16:59 -0700)]
Merge pull request #3998 from aardappel/master
Switched C# accessors from classes to structs
Romain Gilles [Tue, 6 Sep 2016 21:28:22 +0000 (23:28 +0200)]
Use the find -exec instead of find ... | xargs otherwise when there is error log in the output of the build.
changnet [Tue, 6 Sep 2016 17:12:04 +0000 (01:12 +0800)]
option to build shared library,defeault off
Romain Gilles [Thu, 1 Sep 2016 11:01:07 +0000 (13:01 +0200)]
Remove commented line. Add a last step that remove the target folder after the build and the tests execution.
Wouter van Oortmerssen [Sat, 13 Aug 2016 01:01:38 +0000 (18:01 -0700)]
Switched C# accessors from classes to structs
Romain Gilles [Tue, 30 Aug 2016 08:18:47 +0000 (10:18 +0200)]
Add remove of remaining class files before running the build
Romain Gilles [Mon, 29 Aug 2016 09:26:31 +0000 (11:26 +0200)]
Isolate the complied Java classes into a target folder + log java version.
It is a common practice to put all the compiled classes into a
dedicated folder in order to:
- avoid to mix the code and the complied classes
- to allow a simple way to remove the complied classes
Add log of java version in order to make it explicit to the end user.
Wouter van Oortmerssen [Fri, 26 Aug 2016 22:26:40 +0000 (15:26 -0700)]
Merge pull request #4007 from TGIshib/key
lookupByKey corrections
TGIshib [Fri, 26 Aug 2016 22:21:15 +0000 (01:21 +0300)]
Remove languages check
TGIshib [Fri, 26 Aug 2016 21:42:06 +0000 (00:42 +0300)]
Update idl_gen_general.cpp
TGIshib [Fri, 26 Aug 2016 21:35:06 +0000 (00:35 +0300)]
Merge remote-tracking branch 'refs/remotes/google/master' into key
# Conflicts:
# src/idl_gen_general.cpp
Wouter van Oortmerssen [Fri, 26 Aug 2016 21:18:04 +0000 (14:18 -0700)]
Fixed compile error in LookupByKey fix.
Change-Id: Ice94f09197235cf71b41a22d0767bd7b119284e1
TGIshib [Fri, 26 Aug 2016 21:04:25 +0000 (00:04 +0300)]
Last idl_gen_general.cpp update
Wouter van Oortmerssen [Fri, 26 Aug 2016 21:02:00 +0000 (14:02 -0700)]
Undo compile Java classes into target folder.
This was causing class loader errors on Java 1.6.
Change-Id: Id1d9e7e369aad639115664c43a867c4d3a82f9f1
Tested: on Linux.
Wouter van Oortmerssen [Fri, 26 Aug 2016 20:57:40 +0000 (13:57 -0700)]
Fixed Java LookupByKey functionality for Java 1.6
Tested: on Linux.
Change-Id: Iea336f75a3b6e722743563813c3c9ed9db4d02fe
TGIshib [Fri, 26 Aug 2016 20:47:23 +0000 (23:47 +0300)]
Update idl_gen_general.cpp
TGIshib [Fri, 26 Aug 2016 20:15:25 +0000 (23:15 +0300)]
Correct idl_gen_general
Wouter van Oortmerssen [Fri, 26 Aug 2016 19:03:28 +0000 (12:03 -0700)]
Merge pull request #3978 from TGIshib/key
Find by key on C# and Java (2)
TGIshib [Fri, 26 Aug 2016 16:41:32 +0000 (19:41 +0300)]
Fix lookupByKey, improve compareStrings
Wouter van Oortmerssen [Fri, 26 Aug 2016 16:22:29 +0000 (09:22 -0700)]
Merge pull request #4003 from rgilles/master
Isolate the complied Java classes into a target folder.