organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
4561 commits 28 branches 36 tags 41 MiB
Commit graph

4561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Feng Xiao
478119fe77 Fix python3 issue. 2017-04-20 16:30:26 -07:00
Paul Yang
4c57e8475f Prepend "PB" to generated classes whose name are reserved words. (#2990) 2017-04-20 01:19:03 -07:00
Paul Yang
b97cd573e4 Add test for nested enum for php (#2989) 2017-04-19 21:20:55 -07:00
Paul Yang
7be088202b Enum defined without package have incorrect class name. (#2988) 
Fix the bug by sharing the code for generating class name for both
message and enum.
 2017-04-19 20:03:34 -07:00
Paul Yang
190b5270c8 Make PHP c extension work with PHP7 (#2951) 2017-04-19 16:23:51 -07:00
Feng Xiao
43234828da Merge pull request #2967 from xfxyjwf/3.3.x 
Fix map serialization
 2017-04-11 16:52:06 -07:00
Feng Xiao
5777259273 Cherry-pick cl/152450543 2017-04-11 16:15:46 -07:00
Feng Xiao
cad0258d17 Cherry-pick cl/151775298 2017-04-11 16:14:00 -07:00
Feng Xiao
fc3ea97870 Merge pull request #2955 from xfxyjwf/3.3.x 
Add include for INT_MAX
 2017-04-11 16:13:32 -07:00
Jie Luo
899460c9cb cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) 
* Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()

* Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
 2017-04-10 16:37:57 -07:00
Feng Xiao
bfeeb98517 Add include for INT_MAX 2017-04-08 00:39:03 +00:00
Feng Xiao
e91caa1f19 Merge pull request #2949 from xfxyjwf/3.3.x 
Cleanup reflection objects for map entry.
 2017-04-07 11:30:40 -07:00
Feng Xiao
ee9c7f17e9 Cleanup reflection objects for map entry. 2017-04-06 16:47:18 -07:00
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
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
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