Commit Graph

3217 Commits

Author SHA1 Message Date
Feng Xiao
1e2fece3e0 Configure conformance tests to build with C++11 (require GCC 4.8)
[skip ci]
2015-12-21 00:28:37 -08:00
Feng Xiao
b27f2893b2 Merge pull request #1062 from rinatz/master
Fix static non-pod type problem with dlopen
2015-12-18 17:36:14 -08:00
Kenichiro IDA
674e92d314 Initialize singleton instance by GoogleOnceInit() 2015-12-19 10:14:42 +09:00
Jan Tattermusch
43f9cb1e6f Merge pull request #1059 from jtattermusch/add_refgen_dependency
Add reference generator dependency
2015-12-17 14:44:09 -08:00
Thomas Van Lenten
6b228f3532 Merge pull request #1060 from thomasvl/drop_spinlocks
Drop all use of OSSpinLock
2015-12-17 16:45:32 -05:00
Thomas Van Lenten
d6590d6534 Drop all use of OSSpinLock
Apple engineers have pointed out that OSSpinLocks are vulnerable to live locking
on iOS in cases of priority inversion:
. http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/
. https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html

- Use a dispatch_semaphore_t within the extension registry.
- Use a dispatch_semaphore_t for protecting autocreation within messages.
- Drop the custom/internal GPBString class since we don't have really good
  numbers to judge the locking replacements and it isn't required. We can
  always bring it back with real data in the future.
2015-12-17 16:05:50 -05:00
Feng Xiao
9e1777f4b0 Merge pull request #1052 from tswast/master
Add region tags to the Go protobuf examples.
2015-12-17 11:42:59 -08:00
Jan Tattermusch
00ace95ae3 add reference generator dependency 2015-12-17 09:37:56 -08:00
Jon Skeet
afbc89a263 Merge pull request #1049 from jskeet/any-format
Handle Any formatting for diagnostic purposes
2015-12-17 13:10:16 +00:00
Tim Swast
7df1d773b7 Improves readability of Go example test. 2015-12-16 14:46:28 -08:00
Feng Xiao
a0cecfd31a Make conformance tests build for C++ and Java.
Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
2015-12-16 13:38:10 -08:00
Jan Tattermusch
33106681a5 Merge pull request #1051 from jtattermusch/support_coreclr
Make nuget package support coreCLR
2015-12-16 13:14:02 -08:00
Jan Tattermusch
637102cf38 Merge pull request #1026 from jskeet/any-conformance
Add JSON parsing to conformance tests.
2015-12-16 09:50:49 -08:00
Jan Tattermusch
52139f9fde make nuget package support CoreCLR 2015-12-16 09:21:09 -08:00
Kenichiro IDA
894d18fba4 Alter FileDescriptorTables::kEmpty to GetEmptyInstance() 2015-12-17 01:46:48 +09:00
Jon Skeet
a4dc5968b1 Add JSON parsing to conformance tests. 2015-12-16 08:58:58 +00:00
Tim Swast
1cc541b3be Add region tags to the Go protobuf examples.
This will allow us to like to specific snippets of code in the
documentation.  I plan to create a tutorial similar to the C# tutorial
https://developers.google.com/protocol-buffers/docs/csharptutorial

Since that tutorial has sections for populating a proto, parsing, and
serializing, I made a region for each of these for Go.  To make the
populating sample more self-contained, I refactor the listing example
slightly.
2015-12-15 15:56:23 -08:00
Jon Skeet
adee6fe332 Generated code changes from previous commit. 2015-12-15 09:24:04 +00:00
Jon Skeet
aabc6c411a Make ToString() valid without a type registry
This addresses issue #1008, by creating a JsonFormatter which is private and only different
to JsonFormatter.Default in terms of reference equality.

Other plausible designs:

- The same, but expose the diagnostic-only formatter
- Add something to settings to say "I don't have a type registry at all"
- Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed)

Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any.

Generated code changes follow in the next commit.
2015-12-15 09:23:38 +00:00
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
13e1279d86 Remove internal options from proto files.
Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
2015-12-14 15:54:26 -08:00
Feng Xiao
85c4c36c82 Remove the usage of C++11 override.
[skip appveyor]

Change-Id: I700f70e734abb6264db29369ecf227a9e1f783e7
2015-12-14 14:49:44 -08:00
Feng Xiao
1c10aca679 Add new files to Makefile.am 2015-12-14 14:04:09 -08: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
Feng Xiao
e841bac4fc Down-integrate from internal code base. 2015-12-11 17:10:28 -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