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

4763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feng Xiao
18c13c93de Merge pull request #2942 from xfxyjwf/3.3.x 
Update version number and changelog for 3.3.0
 2017-04-06 11:46:51 -07:00
Feng Xiao
21b0b3ca36 Update generated code. 2017-04-05 17:45:21 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00
Jie Luo
69bfde22b6 Merge pull request #2922 from anandolee/master 
Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()
 2017-04-05 16:34:54 -07:00
Anuraag Agrawal
09328db1ff Fix test for unexpected type url when parsing Any. Currently, the test fails since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields. 2017-04-05 17:44:26 +09:00
Adam Cozzette
139fd0a1c5 Merge pull request #2933 from mharrend/patch-1 
Adding default shell env to allow non-default compilers
 2017-04-04 09:34:06 -07:00
Adam Cozzette
37c7b766b3 Merge pull request #2930 from anuraaga/dev_rag 
Fix error message for int64 parse failure.
 2017-04-04 09:31:14 -07:00
Anuraag Agrawal
662f97841e Fix duplicate fields test. The repeated version is passing because null values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). 
Also fix spelling of a test.
 2017-04-04 17:27:53 +09:00
Adam Cozzette
cc3fa2ec80 Merge pull request #2676 from acozzette/js-compatibility-tests 
JS compatibility tests
 2017-04-03 14:39:26 -07:00
Adam Cozzette
10ea25133d Added compatibility tests for version 3.0.0 2017-04-03 12:55:20 -07:00
Adam Cozzette
7e5f980508 Split test protos into two groups 2017-04-03 12:55:20 -07:00
Marco A. Harrendorf
dd04ffb923 Adding default shell env 
I am adding default shell environment, so that protobuf compilation makes use of set
LD_LIBRARY_PATH and so on.
In this way, also non-default gcc installations (e.g. not in /usr/lib) can be used to compile protobuf.
This would fix the following issue:
https://github.com/bazelbuild/bazel/issues/2515
 2017-04-03 17:01:36 +02:00
Anuraag Agrawal
58373fa160 Fix error message for int64 parse error. 2017-04-03 17:35:42 +09:00
Anuraag Agrawal
11c902ea2e Add IntelliJ project to gitignore for java project. 2017-04-03 17:32:08 +09:00
Feng Xiao
bd74319107 Update Java conformance failure list. 2017-03-31 15:59:48 -07:00
Feng Xiao
32ad5a3e0d Use "git reset --hard" to actually reset the code. 2017-03-31 14:04:29 -07:00
Feng Xiao
b7c813fb67 Update jenkins Java dependencies. 2017-03-31 11:13:28 -07:00
Feng Xiao
c2b3b3e04e Update Java version number and dependency. 2017-03-30 18:25:11 -07:00
Feng Xiao
624d44f042 Update objective-c conformance failure list. 2017-03-30 17:45:14 -07:00
Feng Xiao
d5827784cf Fix C++ distcheck. 2017-03-30 17:43:45 -07:00
Feng Xiao
fe97d79abf Fix MSVC DLL build. 2017-03-30 23:54:39 +00:00
Feng Xiao
fab8812cc1 Update python conformance failure list. 2017-03-30 16:05:25 -07:00
Feng Xiao
c52e54f62b Update jenkins Java maven dependencies. 2017-03-30 15:57:18 -07:00
Feng Xiao
057a2851e4 Update C# conformance failure list. 2017-03-29 16:19:00 -07:00
Feng Xiao
e47c068cfa Update python conformance failure list. 2017-03-29 16:17:18 -07:00
Feng Xiao
84f6954ca9 Fix Java build. 2017-03-29 16:03:53 -07:00
Jie Luo
c348d46a9b Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() 2017-03-29 15:54:06 -07:00
Feng Xiao
acde1651b5 Update BUILD file for C# tests. 2017-03-29 15:14:18 -07:00
Feng Xiao
32d7830e4b Fix C++ build for down-integration. 2017-03-29 14:52:33 -07:00
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Juan David Dominguez
4a0dd03e52 Removes ignored const from return type (#2915) 
See https://github.com/google/protobuf/issues/2425
 2017-03-29 11:39:29 -07:00
Thomas Van Lenten
258406b88f Merge pull request #2919 from thomasvl/drop_dispatch 
Remove the use of dispatch_once that is heap backed.
 2017-03-29 14:07:07 -04:00
Thomas Van Lenten
130c166697 Remove the use of dispatch_once that is heap backed. 
Apple recently updated the docs on dispatch_once to point out
that the storage for the dispatch_once_t must be static or global,
but not something that was ever used before as the implementation
doesn't use a memory barrier.  So we drop the use and create the
semaphore when needed and use an atomic swap deal with any
threading races.
 2017-03-29 13:03:33 -04:00
Thomas Van Lenten
ba3fa41ba8 Merge pull request #2918 from thomasvl/xcode_8_3 
Add support for Xcode 8.3 to the build helper.
 2017-03-29 11:03:30 -04:00
Thomas Van Lenten
558ba98811 Add support for Xcode 8.3 to the build helper. 2017-03-29 11:02:51 -04:00
Thomas Van Lenten
04c77c4e4b Merge pull request #2913 from thomasvl/conformance_ignores 
Add some new ignores for things generated in conformance.
 2017-03-29 09:44:59 -04:00
drivehappy
d43eaf2b8f Fix gcc warning when using map (#2213) 
* Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression.

* Updated per 80 character wrap.
 2017-03-28 16:57:19 -07:00
Adam Cozzette
585993201a Merge pull request #2914 from acozzette/nacl 
Added a workaround to allow building for NaCl
 2017-03-28 13:54:50 -07:00
Adam Cozzette
f316375a95 Added a workaround to allow building for NaCl 
arm-nacl-clang seems to produce a mysterious compiler error when it
encounters __builtin_clzll, so when we are building for NaCl, let's
avoid that in favor of the portable implementation of
Log2FloorNonZero64.
 2017-03-28 09:45:14 -07:00
Thomas Van Lenten
8adf57e0fa Add some new ignores for things generated in conformance. 2017-03-28 11:04:58 -04:00
Thomas Van Lenten
b3f3e123aa Merge pull request #2912 from thomasvl/objc_recursion_limit 
Raise the recursion limit to 100 to match other languages.
 2017-03-28 09:18:14 -04:00
Thomas Van Lenten
ddb438855a Raise the recursion limit to 100 to match other languages. 2017-03-28 09:10:20 -04:00
Joshua Haberman
d9e0119f2c Merge pull request #2858 from haberman/gopackage 
Changed go_package for plugin.proto.
 2017-03-27 12:04:08 -07:00
Joshua Haberman
c565e25c7d Merge pull request #1662 from haberman/jsconformance 
Conformance tests for JavaScript (Node.js). 15 tests are failing.
 2017-03-27 12:03:09 -07:00
Jie Luo
7610f101e8 Merge pull request #2884 from anandolee/master 
Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
 2017-03-27 11:05:38 -07:00
Jie Luo
689e4bf5f4 Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings to multiple options. 2017-03-24 12:05:52 -07:00
Feng Xiao
373809e5f5 Merge pull request #2897 from cgrushko/patch-5 
Compile the Java proto runtime with Java 6
 2017-03-22 13:35:52 -07:00
cgrushko
6f21e29268 Compile the Java proto runtime with Java 6 
in order to avoid errors related to generics when 
building user code in newer versions of Java.
 2017-03-22 14:27:51 -04:00
Paul Yang
1387a6795c Update commit number in Docker to update composer dependency (#2869) 2017-03-21 10:18:49 -07:00
Adam Cozzette
ffa932bf10 Merge pull request #2861 from byronyi/#710 
migrate delimited messages functions to util package
 2017-03-20 13:02:40 -07:00