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

4012 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Cozzette
9f69353562 Merge pull request #2421 from tsondergaard/3.1.x 
Export fixed_address_empty_string
 2016-11-29 09:27:32 -08:00
Thomas Sondergaard
c699788573 Export fixed_address_empty_string 
commit 98835fb8f8 broke use of protobuf as shared library on Windows. Example
error message:

  error LNK2001: unresolved external symbol "class google::protobuf::internal::ExplicitlyConstructed<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > google::protobuf::internal::fixed_address_empty_string"
 2016-11-28 12:13:04 +01:00
Paul Yang
0c34e86a51 Fix php test on mac. (#2402) 
Previously, this has been fixed on master in
51c5ff889c.
 2016-11-22 13:34:28 -08:00
Paul Yang
2286e5f4d0 Rename Empty to GPBEmpty in php generated file. (#2379) 
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-21 12:01:51 -08:00
Paul Yang
60d95f36c0 Fix the bug that message without namespace is not found in the descriptor pool. (#2240) 2016-10-11 10:36:25 -07:00
Feng Xiao
0321baf9e8 Merge pull request #2203 from mrry/msvc_fix 
Fix MSVC build when HAVE_LONG_LONG is defined.
 2016-10-11 10:28:05 -07:00
Paul Yang
bc3bff165f Fix python_cpp test on Mac. Link staticly when building extension, so that the extension doesn't require installing protobuf library. (#2232) 2016-10-07 16:09:26 -07:00
Bo Yang
b0d62dd713 Add csharp/build_tools.sh for dist check. 2016-10-06 10:23:34 -07:00
Bo Yang
96e2d76491 Fix compile error for php on Mac. 2016-10-05 19:15:31 -07:00
Bo Yang
75b69887aa Fix segmentation fault when ZTS is defined. 2016-10-05 11:00:39 -07:00
Stanley Cheung
52ab3b07ac PHP: fix ZTS tsrm_ls errors (#2189) 
* PHP: fix ZTS tsrm_ls errors

* Fix a few more macros
 2016-10-04 13:39:51 -07:00
Adam Cozzette
71e5994b1a Merge pull request #2193 from acozzette/common-js-fix 
Fixed references to foreign nested messages with CommonJS-style imports
 2016-10-04 13:14:12 -07:00
Bo Yang
2d897c8fa2 Add test for php zts build. 2016-10-04 17:50:59 +00:00
Bo Yang
3a055be925 Prepare jenkins for testing php zts build. 2016-10-04 17:23:21 +00:00
Adam Cozzette
640c947458 Merge pull request #2204 from acozzette/enum-names 
Do strict enum name checking only for proto3
 2016-10-04 09:58:54 -07:00
Adam Cozzette
149659b72a Do strict enum name checking only for proto3 
There seem to already be .proto files out there that have conflicting
enum names, which will not be able to build successfully for some
languages (like C#). To prevent this problem from spreading, let's make
it an error for proto3 but just issue a warning for proto2. This fixes
issue #2179.
 2016-10-04 07:19:54 -07:00
Bo Yang
858db7a202 Add travis test on Mac for php. 2016-10-03 23:07:21 +00:00
Bo Yang
bcb32c0b86 Test php5.5_c test on jenkins 2016-10-03 20:48:39 +00:00
Bo Yang
dae50dc56a Trigger automated tests for php. 2016-09-30 01:20:41 +00:00
Bo Yang
f17528a1fa Set up environment for php automated tests. 2016-09-30 01:10:34 +00:00
Bo Yang
1baaedfb3d Add php test script for automated tests. 2016-09-30 01:08:33 +00:00
Derek Murray
1d2c7b6c73 Fix MSVC build when HAVE_LONG_LONG is defined. 2016-09-29 12:52:54 -07:00
Bo Yang
b9bad65bf3 Add script to build Google.Protobuf.Tools for csharp. 2016-09-28 13:51:57 -07:00
Joshua Haberman
3b88a4ae87 Merge pull request #2196 from haberman/nodefix 
Added alias getFieldProto3 as used by older generated code.
 2016-09-28 12:39:23 -07:00
Josh Haberman
8b54280395 Added alias getFieldProto3 as used by older generated code. 
Un-breaks users who have old generated code and upgrade
to the 3.1.0 release.
 2016-09-28 11:11:52 -07:00
Adam Cozzette
c4d70123ac Fixed references to foreign nested messages with CommonJS-style imports 
A bug was causing generated JSPB code with CommonJS-style imports to
refer incorrectly to nested messages from other .proto files. The
generated code would have things like "test_pb.InnerMessage" instead of
"test_pb.OuterMessage.InnerMessage". This commit fixes the problem by
correctly taking into account any message nesting.
 2016-09-27 17:25:00 -07:00
Bo Yang
787f3fb163 Fixing inconsistent php version number. 2016-09-26 12:48:28 -07:00
Feng Xiao
c531b49d38 Merge pull request #2181 from google/jtattermusch-patch-2 
Update README.md
 2016-09-26 10:13:08 -07:00
Jan Tattermusch
530eede12b Update README.md 2016-09-26 10:38:00 +02:00
Feng Xiao
4d3e4cfa4a Fix MSVC stack overflow issue. 2016-09-23 23:53:43 -07:00
Bo Yang
a428e42072 Add php files for make dist. 2016-09-23 19:12:45 -07:00
Paul Yang
e7269aa4f6 Update change log for 3.1.0 (#2173) 2016-09-23 18:33:25 -07:00
Feng Xiao
87d61e44fa Merge pull request #2175 from xfxyjwf/fix_json 
Fix VS test failures.
 2016-09-23 17:57:41 -07:00
Feng Xiao
5248f61a34 Force a rebuild of Jenkins docker image. 
Needed to pick up a Java dependency change and re-populate the offline
repo.

[skip ci]
 2016-09-23 17:35:23 -07:00
Stanley Cheung
907a075d7e php: support 5.5.9 for pecl extension (#2174) 2016-09-23 17:05:45 -07:00
Feng Xiao
3c88e1b53d Fix VS test failures. 2016-09-23 16:53:01 -07:00
Feng Xiao
c454b44335 Merge pull request #2171 from xfxyjwf/fix_json 
Reduce test length to avoid stack overflow on VS.
 2016-09-23 16:50:42 -07:00
Feng Xiao
73c8723266 Use "appveyor DownloadFile" 
"ps: StartFileDownload" is broken by a recent appveyor image update:
http://help.appveyor.com/discussions/problems/5308-ci-frequently-hangs-with-recent-image-update

Change-Id: Ia73aa8b12f77eb9bbec556a4c05310153aad97bf
 2016-09-23 16:04:38 -07:00
Bo Yang
18f336b98a Update php supported version. 2016-09-23 22:22:18 +00:00
Feng Xiao
f6b4d188b4 Reduce test length to avoid stack overflow on VS. 2016-09-23 21:45:03 +00:00
Bo Yang
411968d01f Fix python cpp. 2016-09-23 21:38:35 +00:00
Feng Xiao
37c3d05f57 Merge pull request #2167 from xfxyjwf/fix_vs 
Fix Visual Studio compile issues.
 2016-09-23 12:11:04 -07:00
Feng Xiao
0798d91f55 Fix Visual Studio compile issues. 
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
 2016-09-23 11:55:26 -07:00
Jisi Liu
3bfc09d548 Merge pull request #2170 from pherl/3.1.x 
Fix default instance destructor and memory leaks
 2016-09-23 11:29:21 -07:00
Jisi Liu
f184cb6035 Fix default instance destructor 2016-09-23 11:17:00 -07:00
Jisi Liu
34996c31b7 Merge branch '3.1.x' of github.com:google/protobuf into 3.1.x 2016-09-23 11:14:37 -07:00
Bo Yang
8c88762e3e Update version number. 2016-09-22 19:24:19 -07:00
Bo Yang
94bbeb4681 Bump library version to 11 2016-09-22 18:10:00 -07:00
Bo Yang
1b7a844fa1 Add back removed descriptor field. 2016-09-22 18:04:02 -07:00
Bo Yang
9cb812fab5 Modify php api version and minimum supported php version. 2016-09-22 17:17:01 -07:00