AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
4,179 Commits 35 Branches 138 Tags 124 MiB
5d63097fc2
Commit Graph

4179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cozzette
5d63097fc2 Merge branch 'master' into down-integrate-with-msvc-fix 2016-11-17 17:04:30 -08:00
Adam Cozzette
5a76e633ea Integrated internal changes from Google 2016-11-17 16:59:59 -08:00
Adam Cozzette
cd315dcbad Merge pull request #2383 from snapsam/patch-1 
Update README.md
 2016-11-17 16:26:35 -08:00
Adam Cozzette
44edefaef6 Merge pull request #2382 from zhsyourai/master 
Add LL to large constant
 2016-11-17 16:23:56 -08:00
Samuel Rossoff (of The Ebon Blade)
d571d39923 Update README.md 
needed a grave here, not an apostrophy
 2016-11-17 10:58:45 -08:00
zhsyourai
14c147ea79 Add LL to large constant 
Some compiler will report: 'error: integer constant is too large for long type'
 2016-11-18 01:05:08 +08:00
Paul Yang
99564c3347 Rename Empty to GPBEmpty in php generated file. 
In php, class name cannot be "Empty". Modified code generator to (#2375) generate GPBEmpty instead (for google.protobuf.Empty only). Also change
runtime code to work with the new generated code accordingly.
 2016-11-16 11:07:43 -08:00
Adam Cozzette
fc27ead107 Merge pull request #2362 from wujingchao/patch-1 
Class is final but declares protected field
 2016-11-16 10:07:50 -08:00
Adam Cozzette
a3dfbe6e52 Merge pull request #2378 from ianfhunter/patch-1 
typo in readme
 2016-11-16 09:42:09 -08:00
Adam Cozzette
01d321c2d6 Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc 
Add missing include in message_lite.cc
 2016-11-16 09:36:28 -08:00
Ian Hunter
130bb0739a typo 2016-11-16 17:34:28 +00:00
Feng Xiao
83d6411bf3 Fix jenkins tests. 2016-11-15 14:15:57 -08:00
Joshua Haberman
bf379715c9 Merge pull request #2323 from marcinwyszynski/master 
More Ruby-eqsue interface
 2016-11-15 10:31:15 -08:00
Joshua Haberman
c6f3d700b9 Merge pull request #1907 from evokly/js-utf8-fix 
JS: Fix for high utf-8 codepoints.
 2016-11-15 09:29:46 -08:00
Wojciech Mandrysz
bd850a25f5 JS: Well, this is the right place for surrogates. 2016-11-15 14:10:09 +01:00
Wojciech Mandrysz
292c2c91cf JS: Re-added comment, moved surrogates code to the right place 2016-11-15 12:44:15 +01:00
Feng Xiao
6e93fa41c4 Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator 
Fix #include in js_generator.cc
 2016-11-14 13:50:51 -08:00
Feng Xiao
a95d052bdb Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json 
Fix csharp/src/Google.Protobuf.Test/project.json
 2016-11-14 13:40:59 -08:00
Julien Brianceau
3c0e0ce2b0 Fix csharp/src/Google.Protobuf.Test/project.json 
This change fixes the following Chromium presubmit error:

  third_party/protobuf/csharp/src/Google.Protobuf.Test/project.json could
  not be parsed: Expecting property name: line 25 column 3 (char 482)
 2016-11-14 22:32:15 +01:00
Julien Brianceau
aac9ed8e39 Add missing include in message_lite.cc 
This changes fixes "use of undeclared identifier 'INT_MAX'"
compilation error.
 2016-11-14 22:19:37 +01:00
Julien Brianceau
3316062e98 Fix #include in js_generator.cc 
Reland commit f2885f6 that has been trampled by commit d64a2d99.
 2016-11-14 22:13:16 +01:00
Marcin Wyszynski
74a636a7a2 Move variable declarations before actual code 2016-11-14 21:45:37 +01:00
Joshua Haberman
0c0f7e2aa8 Merge pull request #2364 from haberman/jslicense 
Fixed JavaScript license declaration.
 2016-11-14 11:45:36 -08:00
Josh Haberman
5d9dbe3ecc Fixed JavaScript license declaration. 2016-11-14 10:37:51 -08:00
wujingchao
abeff7b4fd Class is final but declares protected field 
This class is declared to be final, but declares fields to be protected. Since the class is final, it can not be derived from, and the use of protected is confusing.
 2016-11-14 15:48:53 +08:00
Feng Xiao
a30e5af204 Merge pull request #2358 from ckennelly/master 
Resolve old TODO for StringTypeHandler.
 2016-11-11 16:22:16 -08:00
Chris Kennelly
e02cb2bb83 Resolve old TODO for StringTypeHandler. 
StringSpaceUsedExcludingSelf has been part of the lite library since
b913cbd.
 2016-11-11 16:10:41 -08:00
Feng Xiao
8a4b2c573a Merge pull request #2353 from guptasu/master 
MessageOptions should handle both proto2 and google.protobuf package names.
 2016-11-11 12:31:52 -08:00
Feng Xiao
df56736db9 Merge pull request #2357 from D3Hunter/master 
#2356 : fix ExceptionInInitializerError on IBM J9
 2016-11-11 10:45:54 -08:00
Time
ed08341234 #2356 : fix ExceptionInInitializerError on IBM J9 2016-11-11 16:47:41 +08:00
Paul Yang
df8390790a Fix php c extension on 32-bit machines. (#2348) 2016-11-10 11:20:50 -08:00
Feng Xiao
9f75c5aa85 Merge pull request #2337 from sergiocampama/deprecation 
Fixes deprecation warnings/errors on Xcode
 2016-11-10 10:48:51 -08:00
guptasu
fce8b6b924 Made helper code also consider package name 'proto2' when dealing with MessageOptions. 
This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
 2016-11-10 10:23:00 -08:00
Sergio Campama
e75cf40e8f Fixing references to the removed atomicops_internals_pnacl.h file. 2016-11-10 10:20:07 -05:00
Adam Cozzette
ce5160b83b Merge pull request #2332 from Kwizatz/master 
Added explicit cast to avoid size warning on Win64.
 2016-11-09 13:07:24 -08:00
Adam Cozzette
d584321fb4 Merge pull request #2327 from ctubbsii/fix-maven-compiler-plugin 
Use latest maven-compiler-plugin (2.6.0)
 2016-11-09 11:49:55 -08:00
Paul Yang
1f2dbc899b Implement RepeatedFieldIter for c extension. (#2333) 2016-11-08 11:38:34 -08:00
Sergio Campama
ecc460ab1b Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac version to that if atomic is enabled 2016-11-07 15:43:12 -05:00
Rodrigo Hernandez
975d577a2b Added explicit cast to avoid size warning on Win64. 2016-11-04 14:52:54 -06:00
Adam Cozzette
0d7199edc8 Merge pull request #2329 from acozzette/unused-parameter 
Fix unused parameter warnings in arena_free
 2016-11-04 12:19:46 -07:00
Jisi Liu
ca800ea823 Merge pull request #2330 from manupsunny/master 
Fix message for InvalidProtocolBufferException
 2016-11-04 11:37:40 -07:00
Msp
089aaa996a Fix message for InvalidProtocolBufferException 2016-11-04 23:54:34 +05:30
Adam Cozzette
8785004c80 Fix unused parameter warnings in arena_free 
The size parameter is only used in cases where the compiler supports
sized delete, so when that's not available we need to specifically cast
it to void to prevent a warning.
 2016-11-04 10:01:16 -07:00
Christopher Tubbs
eb7f3a3ad1 Use latest maven-compiler-plugin (2.6.0) 
* Uses build-helper-maven-plugin to add generated sources to the classpath
* Fixes an issue building with newer versions of the maven-compiler-plugin
  (See https://issues.apache.org/jira/browse/MCOMPILER-240)
 2016-11-04 02:11:55 -04:00
Feng Xiao
7bd11fcb59 Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2 
[arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
 2016-11-03 16:59:25 -07:00
Jon Skeet
4c310d78a2 Update conformance test failure list 2016-11-03 18:05:59 +00:00
Jon Skeet
50a37e0135 Change JSON field name formatting 
This affects cases with leading capital letters.

This breaks compatibility with previous C# releases, but
fixes compatibility with other implementations.

See #2278 for details.
 2016-11-03 18:05:59 +00:00
Marcin Wyszynski
cb81314b1b Fix copy pasta in test 2016-11-03 15:00:40 +01:00
Marcin Wyszynski
3bdaaa5dda More Ruby-eqsue interface 2016-11-03 14:19:10 +01:00
Jisi Liu
93a4fa23d0 Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchg 
generic atomicops: Use strong compare_exchange
 2016-11-02 15:03:19 -07:00