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

2289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07:00
Jisi Liu
d119a27549 Merge pull request #621 from nico/staticass 
Let GOOGLE_COMPILE_ASSERT use static_assert if available.
 2015-07-20 17:36:00 -07:00
Joshua Haberman
aba42edd8c Merge pull request #604 from haberman/ruby-conformance 
Added Ruby to conformance tests.
 2015-07-20 11:06:17 -07:00
Josh Haberman
c2c43a4917 Fixed lint errors and responded to CR comments. 
Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910
 2015-07-17 16:29:10 -07:00
Josh Haberman
95ee8fb88e Exclude JRuby from conformance tests for now. 
Change-Id: Id008ebac5159f773e1bde8b85acb2626cbd16de8
 2015-07-17 16:20:01 -07:00
Jisi Liu
58035596e7 Merge pull request #622 from pherl/splitheaders 
Addming missing includes in stubs headers.
 2015-07-17 15:40:42 -07:00
Jisi Liu
51053120db Addming missing includes in stubs headers. 
This is to prepare removing those additional headers in common.h

Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
 2015-07-17 15:40:03 -07:00
Nico Weber
56a90a2081 Let GOOGLE_COMPILE_ASSERT use static_assert if available. 
The motivation is that gcc 4.8+ and clang trunk warn on unused local
typedefs, which COMPILE_ASSERT adds. After this change, the warning
will be happy at least in C++11 builds. static_assert also produces a
slighly nicer diagnostic than the typedef method.

eb93e8bc43
did the same change in re2.
 2015-07-17 14:18:36 -07:00
Jisi Liu
798ed10e7a Merge pull request #613 from pherl/splitheaders 
Split up common.h headers
 2015-07-17 13:57:59 -07:00
Jie Luo
7648852550 Merge pull request #601 from anandolee/master 
ignore UTF-8 BOM
 2015-07-17 13:23:29 -07:00
Jisi Liu
12f6e3dd0e update header list. 
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
 2015-07-17 11:36:51 -07:00
Jisi Liu
4dde2a87a9 Merge branch 'master' of github.com:google/protobuf into splitheader 
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
 2015-07-17 11:36:29 -07:00
Jisi Liu
7b216119ee Update make file for extra headers. 
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
 2015-07-17 11:34:33 -07:00
Jisi Liu
4e694f7b23 Split up common.h headers 
Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
 2015-07-16 16:49:38 -07:00
Josh Haberman
181c7f2636 Added Ruby to conformance tests. 
This involved fixing a few important bugs in the
Ruby implementation -- mostly cases of mixing
upb field types and descriptor types (upb field
types do not distinguish between int/sint/fixed/sfixed
like descriptor types do).

Also added protobuf-specific exceptions so parse
errors can be caught specifically.

Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
 2015-07-16 12:25:55 -07:00
Jie Luo
b2d2cf8b48 ignore UTF-8 BOM if it is in the begining of a proto file 2015-07-16 11:59:21 -07:00
Rob Earhart
2f4fb642a3 Install missing headers 
Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h.

Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
 2015-07-14 17:17:52 -07:00
Jisi Liu
fde6e89f99 Merge pull request #591 from pherl/fixbuild 
remove pbconfig from extract script
 2015-07-13 11:28:25 -07:00
Jisi Liu
bd4bc9e72c remove pbconfig from extract script 
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
 2015-07-13 10:41:18 -07:00
Joshua Haberman
a3ca1fa4bf Merge pull request #588 from haberman/conformance-json 
Added support for JSON and valid input to conformance tests.
 2015-07-13 09:50:01 -07:00
Josh Haberman
b0500b37b2 Added support for Json and valid input to conformance tests. 
This was enabled by the recent open-sourcing of JSON
support and MessageDifferencer.

MessageDifferencer allows the conformance suite to expand
because it allows us to write tests for payloads that parse
successfully.  To verify the testee's output payload, we
need to parse it back into a message and compare the message
instances.  Comparing output bytes vs. a golden message is
*not* valid, because protobufs do not have a canonical
encoding (especially in the presence of maps, which have
no prescribed serialization order).

We only add one small JSON test for now, but with the
framework in place we now have the foundation to dramatically
expand the coverage of the conformance test suite.

Also added the ability for the testee to skip tests that
exercise features that are unimplemented.  This allows
Java (which currently has no JSON support) to skip tests
involving JSON.

Change-Id: I697b4363da432b61ae3b638b4287c4cda1af4deb
 2015-07-10 16:36:59 -07:00
Paul Yang
fe50044041 Merge pull request #570 from google/internal-third-party 
Internal local modifications.
 2015-07-09 15:13:12 -07:00
Bo Yang
9f563bd0d8 Internal local modifications. 2015-07-09 12:39:52 -07:00
Joshua Haberman
5a020d41a5 Merge pull request #575 from haberman/rbleak 
Worked around memory leak bug in Ruby interpreter.
 2015-07-08 17:28:32 -07:00
Josh Haberman
8c717ad530 Worked around memory leak bug in Ruby interpreter. 
Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f
Fixes: https://github.com/google/protobuf/issues/474.
 2015-07-08 14:14:58 -07:00
Paul Yang
ab2094de11 Merge pull request #554 from jcanizales/proto-objc-bazel 
Add Bazel target for the Objective-C protobuf runtime
 2015-07-06 13:05:46 -07:00
Jorge Canizales
d5d7bb3bfb Add Bazel target for protobuf ObjC runtime 
Also add WKT headers to the umbrella file, and simplify Podspec with it.
Plus some layout improvements to the BUILD file.
 2015-07-06 11:17:39 -07:00
Paul Yang
0a27430bd4 Merge pull request #500 from TeBoring/temp 
Implement parsing for proto3 primitive repeated fields.
 2015-07-01 14:35:19 -07:00
Feng Xiao
ec7bbc76be Merge pull request #551 from ostrovsky/master 
MinGW64+MSYS2 compilation issues
 2015-07-01 10:36:30 -07:00
Karol Ostrovsky
ee35402244 MinGW64+MSYS2 compilation issues and portable isnan using MathLimits 2015-07-01 10:09:41 +02:00
Paul Yang
eb162dad5f Merge pull request #458 from xfxyjwf/memory_leak 
Delete default UnknownFieldSet when shuting down.
 2015-06-30 16:45:22 -07:00
Feng Xiao
c3cb53b8f4 Merge pull request #556 from mgiuca/fix-clang-warning 
Fix "sometimes-uninitialized" warning on Windows Clang.
 2015-06-30 11:45:41 -07:00
Matt Giuca
43dcbbfec7 Fix "sometimes-uninitialized" warning on Windows Clang. 2015-06-30 17:23:26 +10:00
Jisi Liu
d40a0db202 Merge pull request #540 from pherl/clean-warnings 
fix compiler warnings.
 2015-06-25 01:37:43 -07:00
Paul Yang
eda912eeb3 Merge pull request #512 from pherl/bazel 
Enable tests for bazel build.
 2015-06-24 16:14:46 -07:00
Jisi Liu
658e72d8fb fix compiler warnings. 
- control reaches end of non-void function.
- remove a deprecated IsMatch.

Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
 2015-06-24 14:56:58 -07:00
Jisi Liu
53c306de19 Merge pull request #538 from google/jtattermusch-patch-1 
fix typo in cmake/README.md
 2015-06-24 14:47:41 -07:00
Jan Tattermusch
60161997c8 fix typo in cmake/README.md 2015-06-24 09:27:23 -07:00
Joshua Haberman
242fdef65a Merge pull request #530 from haberman/updateupb 
Update upb to fix two bugs in the Ruby library.
 2015-06-23 11:31:02 -07:00
Josh Haberman
fb8ed707a2 Update upb to fix two bugs in the Ruby library. 
Fixes:
  https://github.com/google/protobuf/issues/502
  https://github.com/google/protobuf/issues/425
 2015-06-22 17:23:55 -07:00
Feng Xiao
d0eb7786a9 Fix appveyor tests. 2015-06-22 15:09:52 -07:00
Paul Yang
d3d66d7976 Merge pull request #503 from thomasvl/add_nonnill_markup 
Add nonnull/nullable/null_resettable markup to ObjC library.
 2015-06-19 15:58:31 -07:00
Jisi Liu
7a0c431c8f Enable tests for bazel build. 
Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
 2015-06-18 16:45:27 -07:00
Jisi Liu
5b3a8e7635 Merge pull request #510 from pherl/bazel 
Remove OUTS constants in BUILD
 2015-06-18 14:13:56 -07:00
Jisi Liu
94062398dc Remove OUTS constants in BUILD 
Induce those from the input proto file names instead to reduce the
lenght of the BUILD file.

Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
 2015-06-18 14:06:26 -07:00
Jisi Liu
89834be92e Merge pull request #509 from pherl/update_BUILD 
Update BUILD for the recent json util change.
 2015-06-18 13:54:47 -07:00
Jisi Liu
af3eafd1b1 Update BUILD for the recent json util change. 
Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
 2015-06-18 13:39:09 -07:00
Jisi Liu
d6286a9f41 Merge pull request #508 from pherl/nanfix 
using ::isnan to avoid conflicts with std::isnan for C++11 build.
 2015-06-18 13:38:07 -07:00
Jisi Liu
a2b7937777 using ::isnan to avoid conflicts with std::isnan for C++11 build. 
Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
 2015-06-18 13:35:24 -07:00
Jisi Liu
e6484d306d Fix distcheck. 
Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
 2015-06-18 11:24:07 -07:00