AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,368 Commits 35 Branches 138 Tags 124 MiB
072296f186
Commit Graph

3368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
072296f186 Merge pull request #1422 from pherl/master 
Update file list to include the missing extension lite file.
 2016-04-18 15:34:21 -07:00
Jisi Liu
1f4f3e26bd Update file list to include the missing extension lite file. 2016-04-18 14:12:08 -07:00
Joshua Haberman
ca9bbd71d5 Merge pull request #1413 from haberman/updateupb 
Updated upb: JSON parser now accepts both camelCase and original case, and flag to choose on output.
 2016-04-15 12:57:39 -07:00
Josh Haberman
e67ef3d449 Bugfix for JSON error case. 2016-04-14 20:27:45 -07:00
Josh Haberman
800e986012 Remove no longer applicable documentation from README.md. 2016-04-14 18:42:22 -07:00
Josh Haberman
194ad621bb Ruby JSON: always accept both camelCase and original field names. 
For JSON encoding we provide a new option to decide at
encode time whether to use camelCase or original proto field
names:

  json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true)
 2016-04-14 18:33:17 -07:00
Josh Haberman
90c7f6e55e Documented the JSON change and compatibility flags. 2016-04-14 12:48:41 -07:00
Josh Haberman
94e54b39c8 Updated upb: picked up legacy JSON flags to help Ruby users migrate. 
The flags are:

  UPB_JSON_ACCEPT_LEGACY_FIELD_NAMES
  UPB_JSON_WRITE_LEGACY_FIELD_NAMES

The first just allows the parser to accept the old field names.
The second makes the printer print the old field names.

These flags are intended to be temporary, as a migration aid
for users.
 2016-04-14 12:06:09 -07:00
Joshua Haberman
814685ca2c Merge pull request #1397 from google/internal-merge 
Internal merge
 2016-04-11 23:37:42 -07:00
Josh Haberman
3c4ce528c6 Fix for gulpfile.js. 2016-04-11 15:53:25 -07:00
Jan Tattermusch
3ffbdd712f Merge pull request #1400 from jskeet/fix-internal 
Fix to csharp_options - initialize internal_access to false.
 2016-04-10 17:33:18 -07:00
Jon Skeet
0a902ee0ac Fix to csharp_options - initialize internal_access to false. 2016-04-08 09:57:32 +01:00
Josh Haberman
2cd79bf3a8 Removed duplicated operator delete from merge conflict. 2016-04-07 14:26:59 -07:00
Josh Haberman
4465daa57a Merge branch 'master' into internal-merge 2016-04-07 14:10:19 -07:00
Jon Skeet
667f4a6282 Merge pull request #1393 from gvaish/master 
Added support for internal_access for C#
 2016-04-07 22:05:40 +01:00
Josh Haberman
15239361e3 Fix for CommonJS tests. 2016-04-07 14:04:55 -07:00
Jie Luo
09292d5759 Merge pull request #1392 from anandolee/master 
Sync the manually integrate changes in google3/third_party
 2016-04-07 11:05:05 -07:00
Gaurav Vaish
a6e39316a7 Added support for internal_access for C# 2016-04-07 10:33:21 -07:00
Jon Skeet
cef46e115a Merge pull request #1390 from jskeet/tidy-up 
Tidy up for C# codegen
 2016-04-07 08:49:27 +01:00
Jie Luo
c61207492e sync the Manually integrate changes in google3/third_party 2016-04-06 14:32:30 -07:00
Thomas Van Lenten
28c5c25397 Merge pull request #1391 from thomasvl/string_tweaks 
ObjC String followups: one test case only addition, behavior change for invalid UTF-8
 2016-04-06 15:52:17 -04:00
Geoffrey Wiseman
f98d2f5147 Updating Xcode Settings to use iOS 9.3 
Update the simulators used for some tests under Xcode 7.3 to be iOS 9.3.
 2016-04-06 15:29:52 -04:00
Jon Skeet
2a18bb5a33 Add more documentation for csharp_options.h 
This also renames generate_directories to base_namespace_specified; generating directories is the
immediate *effect* of specifying a base namespace, but with this change the options reflect what has been
specified rather than the effect. (There may be other effects in the future, of course.)
 2016-04-06 10:30:19 +01:00
Jon Skeet
bfd1c84a3d Line-wrapping changes only for C# generator code 
This should have no behavioral changes at all.

This doesn't strictly enforce an 80-column limit, but removes the most egregious violations.
The indentation in the C# generator code is inconsistent in general, unfortunately - if we have
any good tools that can be trusted to reformat, I'd be happy to apply them.
 2016-04-06 10:17:13 +01:00
Thomas Van Lenten
c9167f2acd Error during parsing for invalid UTF-8 instead of dropping dropping data. 
This seems to be some code evolution side effects. Back when there was a custom
string class, we couldn't really error when we finally saw the string was bad
so we had to return the empty string, but now that full validation is done
up front, it can error out.
 2016-04-05 17:16:33 -04:00
Thomas Van Lenten
f3f5b3fb64 Add tests to ensure we read strings with BOMs so we don't forget about lessons of the past. 2016-04-05 17:16:33 -04:00
Jon Skeet
89719f07a3 Merge pull request #1349 from gvaish/master 
Added CLI option internal_access for types (C#)
 2016-04-05 20:52:17 +01:00
Feng Xiao
f3fe75bae5 Merge pull request #1386 from andrewharp/patch-2 
Do not link in pthread library for Android builds.
 2016-04-05 10:40:28 -07:00
Gaurav Vaish
74d8b0bebc Added access_level for types 
* `csharp_options`: Added `Options` to encapsulate generator options.
   Supported options for now - file_extension, base_namespace
* `{Blah}Generator`: Now accept `Options*` as parameter to constructor
* `csharp_generator.cc`: Parse and populate options
* `Makefile.am`: Added `csharp_options.h`
* `extract_includes.bat.in`: Added `csharp_options.h`

Refactoring code to two commits. This is the first commit
 2016-04-05 09:47:11 -07:00
Andrew Harp
3b4e7dcf29 Update BUILD 2016-04-04 16:13:31 -04:00
Andrew Harp
b56b461e49 Do not link in pthread library for Android builds. 
This is required to allow Tensorflow to build on Android without hacks. Currently we create a dummy pthread library just to satisfy this dependency for a library that does not exist on Android. See https://github.com/google/protobuf/issues/1373 for more context.
 2016-04-04 15:13:30 -04:00
Thomas Van Lenten
a771c9e11c Merge pull request #852 from qzix/master 
Added deprecated option handling to objective-c
 2016-04-04 11:38:22 -04:00
Oleg Vereshko
268ce2818f Added deprecated option handling for objective-c generator 2016-04-04 18:13:30 +03:00
Jisi Liu
aeacf51602 Merge pull request #1381 from pherl/internal-merge 
Merge Google internal changes to an internal branch
 2016-04-01 17:22:58 -07:00
Jisi Liu
7630a83767 Merge branch 'master' into internal-merge 
Temporarily merges google internal changes. The javascript tests are
still failing and require additional investigation.
 2016-04-01 17:17:59 -07:00
Jisi Liu
cba75ad404 Merge branch 'master' of github.com:google/protobuf 2016-04-01 16:46:49 -07:00
Jisi Liu
89343d87c6 Do not use C++11 unicode escape in unittest. 
For fixing MSVC
 2016-04-01 16:44:46 -07:00
Joshua Haberman
452e2b2c5c Merge pull request #1353 from keveman/master 
Linking the cpp implementation extension statically with libprotobuf
 2016-04-01 16:14:52 -07:00
Manjunath Kudlur
cf828deb9b Linking the cpp implementation extension statically with libprotobuf 2016-04-01 15:58:48 -07:00
Jisi Liu
93811ca9f7 Do not let windows.h define min/max macros 2016-04-01 15:55:49 -07:00
Jisi Liu
3b6df0612d Allow bigobj for map_unittest 2016-04-01 15:02:45 -07:00
Jon Skeet
9d7a1727e5 Merge pull request #1377 from jskeet/remove-duplicate-tests 
Remove duplicate test cases.
 2016-04-01 21:28:56 +01:00
Thomas Van Lenten
a293180541 Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers 
Add -position and -isAtEnd for use when manually parsing input streams.
 2016-04-01 12:37:05 -04:00
Thomas Van Lenten
331cee5022 Add -position and -isAtEnd for use when manually parsing input streams. 2016-04-01 12:26:15 -04:00
Jon Skeet
46e088e2b6 Remove duplicate test cases. 
(NCrunch noticed these.)
 2016-04-01 17:18:45 +01:00
Jan Tattermusch
099ff1ea14 Merge pull request #1369 from jskeet/tools-nuspec 
Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
 2016-03-31 17:44:40 -07:00
Jisi Liu
203bb5eb33 Fix re-definition issue of winsock.h and winsock2.h 2016-03-31 17:38:11 -07:00
Jisi Liu
1bf446c71e Disable sign-compare warning. 2016-03-31 15:48:25 -07:00
Jisi Liu
7b1cbbd50e Fix signed-compare warning. 2016-03-31 15:38:10 -07:00
Jisi Liu
012ac9a0a6 revert unexpected change for py26 2016-03-31 15:26:22 -07:00