Commit graph

4557 commits

Author SHA1 Message Date
Feng Xiao
4920e27a48 Merge pull request #3008 from postmasters/patch-1
Add a link to dart-lang/protobuf
2017-04-24 13:09:48 -07:00
postmasters
4777574a6c Add a link to dart-lang/protobuf 2017-04-24 08:46:56 -07:00
Feng Xiao
14afc3fd41 Merge pull request #2992 from xiaogaozi/patch-1
Add gogoprotobuf to third-party add-ons list
2017-04-20 11:12:02 -07:00
Changjian Gao
f85eecb585 Add gogoprotobuf to third-party add-ons list 2017-04-20 19:53:11 +08:00
Feng Xiao
357afc39de Merge pull request #2508 from yliu120/pass_default_env_to_protoc
add a key to ctx.action dict to prevent protoc losing the default env
2017-04-19 11:28:54 -07:00
Feng Xiao
0a93f67055 Merge pull request #2987 from konsumer/patch-1
Add node-protoc-plugin to "Other Utilities"
2017-04-19 10:30:42 -07:00
Adam Cozzette
594f810081 Merge pull request #2982 from mda000/issue2972
Simplify the Element dtor invocation when freeing elements in InternalDeallocate
2017-04-19 08:34:54 -07:00
David Konsumer
3055a02125 Add node-protoc-plugin to "Other Utilities" 2017-04-18 18:58:21 -07:00
Thomas Van Lenten
a3873cafae Merge pull request #2985 from thomasvl/class_check_tweaks
Tighten up class usage/checks.
2017-04-18 13:28:41 -04:00
Thomas Van Lenten
f5a01d1bbd Tighten up class usage/checks.
- Ensure extensions resolution/wiring is happening directly on the
  messageClass (incase someone is doing odd things our out classes).
- Make the extension message check match the other class checks in
  for mergeFrom/isEqual/etc.
2017-04-18 13:10:52 -04:00
Michael Allen
2240a785f9 Simplify the Element dtor invocation when freeing elements in
InternalDeallocate to avoid confusing the compiler when there's
a class named Element already defined in the global namespace.
2017-04-17 10:59:31 -07:00
Feng Xiao
8aa927f08f Merge pull request #2950 from anuraaga/dev_rag
Allow unknown values for Map put*Value methods just like every other …
2017-04-12 10:42:18 -07:00
Anuraag Agrawal
bf483dfb99 Allow unknown values for Map put*Value methods just like every other enum mutation method. 2017-04-07 14:50:52 +09:00
Adam Cozzette
efec757104 Merge pull request #2937 from anuraaga/dev_rag2
Fix duplicate fields test and Any test. The repeated version is passing because nu…
2017-04-06 16:27:54 -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
Jie Luo
c348d46a9b Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() 2017-03-29 15:54:06 -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
Bairen Yi
312e2dbcfb Update BUILD 2017-03-21 03:52:37 +08:00
Feng Xiao
db3ef48ede Merge pull request #2860 from prehistoric-penguin/master
Remove duplicated copyright statement
2017-03-20 10:49:48 -07:00
Adam Cozzette
20181f6a1a Merge pull request #2854 from hesmar/attributesFix
fix attributes warning
2017-03-20 09:51:31 -07:00
Adam Cozzette
4d273f28dc Merge pull request #2870 from acozzette/memcpy-memmove
Ruby: only link against specific version of memcpy if we're using glibc
2017-03-20 08:26:06 -07:00