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

3485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jisi Liu
aeacf51602 Merge pull request #1381 from pherl/internal-merge 
Merge Google internal changes to an internal branch
 2016-04-01 17:22:58 -07:00
Jisi Liu
7630a83767 Merge branch 'master' into internal-merge 
Temporarily merges google internal changes. The javascript tests are
still failing and require additional investigation.
 2016-04-01 17:17:59 -07:00
Jisi Liu
cba75ad404 Merge branch 'master' of github.com:google/protobuf 2016-04-01 16:46:49 -07:00
Jisi Liu
89343d87c6 Do not use C++11 unicode escape in unittest. 
For fixing MSVC
 2016-04-01 16:44:46 -07:00
Joshua Haberman
452e2b2c5c Merge pull request #1353 from keveman/master 
Linking the cpp implementation extension statically with libprotobuf
 2016-04-01 16:14:52 -07:00
Manjunath Kudlur
cf828deb9b Linking the cpp implementation extension statically with libprotobuf 2016-04-01 15:58:48 -07:00
Jisi Liu
93811ca9f7 Do not let windows.h define min/max macros 2016-04-01 15:55:49 -07:00
Jisi Liu
3b6df0612d Allow bigobj for map_unittest 2016-04-01 15:02:45 -07:00
Jon Skeet
9d7a1727e5 Merge pull request #1377 from jskeet/remove-duplicate-tests 
Remove duplicate test cases.
 2016-04-01 21:28:56 +01:00
Thomas Van Lenten
a293180541 Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers 
Add -position and -isAtEnd for use when manually parsing input streams.
 2016-04-01 12:37:05 -04:00
Thomas Van Lenten
331cee5022 Add -position and -isAtEnd for use when manually parsing input streams. 2016-04-01 12:26:15 -04:00
Jon Skeet
46e088e2b6 Remove duplicate test cases. 
(NCrunch noticed these.)
 2016-04-01 17:18:45 +01:00
Jan Tattermusch
099ff1ea14 Merge pull request #1369 from jskeet/tools-nuspec 
Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
 2016-03-31 17:44:40 -07:00
Jisi Liu
203bb5eb33 Fix re-definition issue of winsock.h and winsock2.h 2016-03-31 17:38:11 -07:00
Jisi Liu
1bf446c71e Disable sign-compare warning. 2016-03-31 15:48:25 -07:00
Jisi Liu
7b1cbbd50e Fix signed-compare warning. 2016-03-31 15:38:10 -07:00
Jisi Liu
012ac9a0a6 revert unexpected change for py26 2016-03-31 15:26:22 -07:00
Jisi Liu
bc1f2e7e6e Fix WIN32 build for map_test. 
stubs/common.h undefines the GetMessage macro introduced in windows.h
map_test however include stubs/common.h before windows.h is transitively
included. This hack force map_test.cc to include windows.h first, so we
have a chance to undefine the GetMessage macro.
 2016-03-31 15:17:40 -07:00
Jisi Liu
cbfd9d43c8 Remove export macros for classes nested in a template class. 2016-03-31 14:47:24 -07:00
Joshua Haberman
81eb84c029 Merge pull request #1371 from keveman/oversize_protos 
Added an API to allow oversize protos when using C++ extension in Python
 2016-03-31 14:31:05 -07:00
Manjunath Kudlur
1283625b0f Added an API to allow oversize protos when using C++ extension in Python 2016-03-31 14:14:58 -07:00
Jisi Liu
5805c2dfb7 Fix javanano package 2016-03-31 13:50:38 -07:00
Jisi Liu
fc7eeda69c Fix json_format.py in py26 2016-03-31 13:36:32 -07:00
Feng Xiao
5c63266ed3 Merge pull request #1366 from xyzzyz/int128_ostream 
Replace #include <iostream> with #include <ostream> in int128.cc
 2016-03-31 13:29:29 -07:00
Jisi Liu
94aa50ffd6 Fix breakage of referring to table_ in static func 
Referencing data member table_ in static functions break certain
platforms. Change it to refer to the declare type void** instead.
 2016-03-31 13:18:03 -07:00
Jisi Liu
9e7fa0678d Temporarily disable begin is fast test. 2016-03-31 13:17:45 -07:00
Jon Skeet
dfd47600d1 Remove duplicate line 2016-03-31 10:46:55 +01:00
Jon Skeet
ca0461c186 Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms. 
I've moved both protoc.exe and the proto files out of Google.Protobuf.
The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc.
It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
 2016-03-31 07:12:17 +01:00
Jan Tattermusch
a16c8a50f0 Merge pull request #1362 from jskeet/tweak_json_name 
Refactoring of FieldDescriptor
 2016-03-30 20:30:51 -07:00
Adam Michalik
955841e620 Replace #include <iostream> with #include <ostream> 
iostream is not actually necessary here, and it introduces unnecessary
static initializers.
 2016-03-30 12:54:40 -07:00
Jisi Liu
0de06f54bc Merge branch 'master' of github.com:google/protobuf 2016-03-30 11:43:44 -07:00
Jisi Liu
3b3c8abb96 Integrate google internal changes. 2016-03-30 11:39:59 -07:00
Jisi Liu
a25e9964b1 Merge pull request #1360 from pherl/master 
Use the T() instead of NULL for the default value.
 2016-03-30 11:28:54 -07:00
Joshua Haberman
34d0cc220b Merge pull request #1295 from haberman/docker 
Add support for running on Jenkins
 2016-03-30 10:51:26 -07:00
Jon Skeet
71e8dca083 Refactoring of FieldDescriptor 
This makes no externally visible behavioral changes. Internally and non-behaviorally:

- We use a field (compiler-generated) to store the JsonName to avoid recomputing it repeatedly
- The documentation for JsonName is updated to reflect the meaning better
- Readonly autoprops and expression-bodied properties used where possible
 2016-03-30 09:42:37 +01:00
Jon Skeet
261fde1707 Merge pull request #1326 from the-alien/csharp_json_name 
csharp: add support for the json_name option
 2016-03-30 09:11:59 +01:00
Josh Haberman
a15b916c41 Merge branch 'master' into docker 2016-03-29 16:24:35 -07:00
Jisi Liu
e164f1083f Use the T() instead of NULL for the default value. 
The template can be specialized on primitives, e.g. double, where
converting NULL will trigger a warning.
 2016-03-29 15:25:49 -07:00
alien
af34538aca Merge branch 'master' of https://github.com/google/protobuf into csharp_json_name 2016-03-29 20:58:23 +03:00
alien
6f8dd2115b Code review fixes 2016-03-29 20:56:32 +03:00
Thomas Van Lenten
261ee021f6 Merge pull request #1358 from thomasvl/travis_tweaks 
Mark iOS tests as able to fail.
 2016-03-29 11:55:04 -04:00
Thomas Van Lenten
8d47d7873e Mark iOS tests as able to fail. 
Travis updated their images to include an xctool that can randomly kill
tests, so mark them as flaky to avoid turning things red.
 2016-03-29 09:21:50 -04:00
Thomas Van Lenten
9240acd179 Merge pull request #1350 from thomasvl/over_release 
The message was autoreleased, the -releases are an over release.
 2016-03-24 15:28:53 -04:00
Thomas Van Lenten
3f917447e7 The message was autoreleased, the -releases are an over release. 2016-03-24 15:25:21 -04:00
Feng Xiao
812691227d Merge pull request #1345 from smparkes/smparkes/well-known-protos 
export well known protos
 2016-03-23 11:36:00 -07:00
Steven Parkes
d5a573274d export well known protos 2016-03-22 17:56:07 -07:00
Feng Xiao
34eeeff640 Merge pull request #1344 from topillar/patch-1 
Update coded_stream.h
 2016-03-22 10:19:42 -07:00
topillar
64dfb5f80a Update coded_stream.h 
fix warning treated as error prevents building on 64-bit windows.
 2016-03-22 23:45:41 +08:00
Feng Xiao
698fa8ee22 Merge pull request #1335 from pradeepg26/master 
Allow custom URLs for Any in JsonFormat
 2016-03-21 11:32:00 -07:00
Thomas Van Lenten
92091363cd Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creation 
Only create the readonlySemaphore on demand.
 2016-03-21 13:57:14 -04:00