Commit Graph

2986 Commits

Author SHA1 Message Date
Peter Newman
1808e8a479 Add the docs claimed define for HAVE_UNORDERED_MAP
Make the code match what the docs claimed, to return a define for HAVE_UNORDERED_MAP
2015-12-15 01:32:27 +00:00
Feng Xiao
dc633398af Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flag
MSVC MP flag to build with multiple processes in visual studio.
2015-12-12 12:12:47 -08:00
Thomas Van Lenten
99a6a95c75 Merge pull request #1041 from thomasvl/use_xc7
Update the min toolchain for iOS/OS X to be Xcode 7
2015-12-11 10:43:12 -05:00
Thomas Van Lenten
938ba41039 Update the min toolchain for iOS/OS X to be Xcode 7
- Let Xcode update the projects, schemes, and info.plists.
- Add workaround for shallow analyzer issues in current Xcode versions (deep analyze gets things correct).
- Tweak the Swift based tests to avoid warnings from Xcode 7's XCTest using optionals for autoenclosure results.
- No longer tag the ObjC iOS travis test as flaky, xctool seems to manage the simulator pretty well.
2015-12-10 16:40:10 -05:00
Thomas Van Lenten
2f2da0702d Merge pull request #1039 from thomasvl/fix_cleans
Fix distclean and maintainer-clean to get more generated files.
2015-12-10 15:39:03 -05:00
Thomas Van Lenten
a20d0b6cd4 Fix dist_clean and maintainer-clean to get more generated files. 2015-12-10 15:34:34 -05:00
Joshua Haberman
014b9012d3 Merge pull request #1029 from keveman/master
Enable fast cpp protos in the python interface.
2015-12-10 09:41:51 -08:00
Feng Xiao
9cbf40873d Merge pull request #1025 from Yangqing/master
Arena type traits standardization.
2015-12-09 16:58:18 -08:00
Yangqing Jia
031558bd36 Minor changes to match the internal version 2015-12-09 15:25:02 -08:00
Feng Xiao
723010dc54 Merge pull request #1033 from c0nk/wip-implicit-cast-fix
Fix narrowing implicit cast in generated message [NFC]
2015-12-09 13:40:38 -08:00
Manjunath Kudlur
96537c461a Bringing in internal::shared_ptr into google:protobuf namespace.
Fixes #1029
2015-12-09 07:40:30 -08:00
Kal Conley
f42a68df54 Fix narrowing implicit cast in generated message [NFC] 2015-12-08 23:12:06 -08:00
Paul Yang
27c522940b Merge pull request #1030 from TeBoring/sandbox
Use angle bracket for well known type proto header.
2015-12-08 16:28:02 -08:00
Bo Yang
1f0286a404 Use angle bracket for well known type proto header. 2015-12-08 14:43:45 -08:00
Thomas Van Lenten
46be1d06f5 Merge pull request #1034 from thomasvl/static_assert_fix
Use compiler provided static assert and avoid tripping unused-local-typedef warnings.
2015-12-08 17:21:43 -05:00
Thomas Van Lenten
52b8d3fe78 Use compiler provided static assert and avoid tripping unused-local-typedef warnings. 2015-12-08 17:18:35 -05:00
Manjunath Kudlur
d03ef20039 Made targets relative to google/protobuf
Fixes #1029
2015-12-08 10:46:26 -08:00
Manjunath Kudlur
7b311afc3e Added util/python/BUILD to provide //util/python:python_headers dependency for building use_fast_cpp_protos 2015-12-08 09:51:14 -08:00
Manjunath Kudlur
a194921527 Made building the python extension configurable via --define=use_fast_cpp_protos=true 2015-12-08 08:24:37 -08:00
Manjunath Kudlur
3f9b4f2944 Updated for c++98 compatibility 2015-12-07 14:15:29 -08:00
Manjunath Kudlur
3ff1dca0bd Enable fast cpp protos in the python interface. 2015-12-07 13:08:21 -08:00
Benjamin Bennett
9fc4d90cab MSVC MP flag to build with multiple processes in visual studio. 2015-12-07 13:54:02 -06:00
Thomas Van Lenten
9bd74b7f25 Merge pull request #1027 from thomasvl/more_nullable_support
Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.
2015-12-07 11:41:49 -05:00
Thomas Van Lenten
c27833b632 Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects. 2015-12-07 10:49:30 -05:00
Yangqing Jia
bbf64cee3d Arena type traits standardization.
This is adapted from the branch of @xfxyjwf at:

494716a682

and should solve the protobuf compilation problem against nvcc.

Tested against nvcc 6.5 and 7.0.
2015-12-05 18:36:18 -08:00
Jisi Liu
b1b9c254e2 Merge pull request #1024 from martinmaly/wkt
Making _genproto rules public.
2015-12-05 09:39:25 -08:00
Joshua Haberman
ba6a28ea9c Merge pull request #1022 from haberman/python-conformance2
Conformance test implementation for Python.
2015-12-04 19:45:50 -08:00
Martin Maly
8e0c9a3f11 Making _genproto rules public.
This enables other xx_proto_library targets to depend on xx_proto_library
targets in different packages, and specifically on xx_wkt_protos.
2015-12-04 17:53:07 -08:00
Joshua Haberman
01e00d251b Merge pull request #1023 from girving/py3
Add srcs_version = "PY2AND3" in BUILD files
2015-12-04 15:57:31 -08:00
Josh Haberman
874eb3648e Remove all bare strings as exceptions. 2015-12-04 15:03:12 -08:00
Geoffrey Irving
29799238c2 Add srcs_version = "PY2AND3" in BUILD files
The sources themselves appear to already be Python 3 clean.
2015-12-03 13:16:06 -08:00
Josh Haberman
4b31ffa488 Added Python failure lists, and fixes to make sure failure propagates. 2015-12-03 12:54:54 -08:00
Jisi Liu
dbc91e9797 Merge pull request #1014 from damienmg/master
Fix headers for gmock.BUILD
2015-12-03 10:16:38 -08:00
Josh Haberman
a3faf080e3 Added JSON support to Python conformance tests. 2015-12-02 13:21:42 -08:00
Josh Haberman
325392dd61 Conformance test implementation for Python. 2015-12-02 12:53:42 -08:00
Thomas Van Lenten
77d56e3e83 Merge pull request #1021 from thomasvl/fix_err_msg
Tweak the error message as the generate is in the core binary these d…
2015-12-02 14:45:13 -05:00
Thomas Van Lenten
536059e569 Tweak the error message as the generate is in the core binary these days. 2015-12-02 14:43:29 -05:00
Thomas Van Lenten
20b4e84f42 Merge pull request #1020 from thomasvl/block_nil
Check and throw errors for nil values/keys (like NSDictionary).
2015-12-02 14:15:03 -05:00
Thomas Van Lenten
764a2248cc Merge pull request #1019 from thomasvl/correct_conformance_compile
Ensure the conformance build of objc code is using the Mac OS X SDK
2015-12-02 13:34:05 -05:00
Thomas Van Lenten
c3a0cf74fe Check and throw errors for nil values/keys (like NSDictionary). 2015-12-02 12:53:35 -05:00
Thomas Van Lenten
69d713fc3c Ensure the conformance build of objc code is using the Mac OS X SDK and 2015-12-02 11:48:14 -05:00
Jon Skeet
e4af879ba2 Merge pull request #1000 from jskeet/any-format
JSON handling for Any
2015-12-02 08:59:44 +00:00
Jon Skeet
3de2fced6b Handle JSON parsing for Any.
This required a rework of the tokenizer to allow for a "replaying" tokenizer, basically in case the @type value comes after the data itself. This rework is nice in some ways (all the pushback and object depth logic in one place) but is a little fragile in terms of token push-back when using the replay tokenizer. It'll be fine for the scenario we need it for, but we should be careful...
2015-12-02 07:54:34 +00:00
Jon Skeet
567579b505 JSON formatting for Any. 2015-12-02 07:26:55 +00:00
Feng Xiao
bdabaeb03d Merge pull request #1016 from tswast/tutorial-regions
Add region tags for protocol buffers tutorials.
2015-12-01 18:00:31 -08:00
Tim Swast
bc4723481a Add region tags for protocol buffers tutorials.
Since these tags might be confusing, added a note that these are not
part of the normal protocol buffers syntax.  I also linked to the main
tutorials page that uses these examples
https://developers.google.com/protocol-buffers/docs/tutorials so that
anyone who arrived here without going through that info first can get
more explanation if they want.
2015-12-01 17:07:18 -08:00
Damien Martin-Guillerez
cc42db83d3 Fix headers for gmock.BUILD
Bazel 0.1.2 fix strict header checks and sandboxing for C++
rules. This change add the necessary headers for gmock so
the headers get shipped in the sandbox.
2015-12-01 22:52:42 +01:00
Feng Xiao
1a59a715dc Merge pull request #998 from tswast/goexample
Add a Go language example.
2015-11-30 13:43:56 -08:00
Feng Xiao
f4e4be6386 Merge pull request #1011 from c0nk/wip-implicit-cast-fix
Fix some narrowing implicit casts [NFC]
2015-11-30 10:40:51 -08:00
Kal Conley
a52539a32d Fix some narrowing implicit casts [NFC] 2015-11-28 20:22:25 -08:00