aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-2142-1055/+404
|\
| * Merge pull request #1062 from rinatz/masterFeng Xiao2015-12-181-3/+28
| |\ | | | | | | Fix static non-pod type problem with dlopen
| | * Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| | |
| | * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
| | |
| * | Merge pull request #1059 from jtattermusch/add_refgen_dependencyJan Tattermusch2015-12-172-0/+14
| |\ \ | | | | | | | | Add reference generator dependency
| | * | add reference generator dependencyJan Tattermusch2015-12-172-0/+14
| | | |
| * | | Merge pull request #1060 from thomasvl/drop_spinlocksThomas Van Lenten2015-12-1711-874/+53
| |\ \ \ | | | | | | | | | | Drop all use of OSSpinLock
| | * | | Drop all use of OSSpinLockThomas Van Lenten2015-12-1711-874/+53
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #1052 from tswast/masterFeng Xiao2015-12-173-22/+53
| |\ \ \ | | |/ / | |/| | Add region tags to the Go protobuf examples.
| | * | Improves readability of Go example test.Tim Swast2015-12-161-25/+5
| | | |
| | * | Add region tags to the Go protobuf examples.Tim Swast2015-12-153-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #1049 from jskeet/any-formatJon Skeet2015-12-1722-118/+192
| |\ \ \ | | | | | | | | | | Handle Any formatting for diagnostic purposes
| | * | | Generated code changes from previous commit.Jon Skeet2015-12-1519-114/+117
| | | | |
| | * | | Make ToString() valid without a type registryJon Skeet2015-12-153-4/+75
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #1051 from jtattermusch/support_coreclrJan Tattermusch2015-12-161-19/+38
| |\ \ \ | | | | | | | | | | Make nuget package support coreCLR
| | * | | make nuget package support CoreCLRJan Tattermusch2015-12-161-19/+38
| | |/ /
| * | | Merge pull request #1026 from jskeet/any-conformanceJan Tattermusch2015-12-161-19/+24
| |\ \ \ | | |/ / | |/| | Add JSON parsing to conformance tests.
| | * | Add JSON parsing to conformance tests.Jon Skeet2015-12-161-19/+24
| |/ /
| * | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagFeng Xiao2015-12-121-0/+2
| |\ \ | | | | | | | | MSVC MP flag to build with multiple processes in visual studio.
| | * | MSVC MP flag to build with multiple processes in visual studio.Benjamin Bennett2015-12-071-0/+2
| | | |
* | | | Configure conformance tests to build with C++11 (require GCC 4.8)Feng Xiao2015-12-212-0/+8
| | | | | | | | | | | | | | | | [skip ci]
* | | | Make conformance tests build for C++ and Java.Feng Xiao2015-12-168-13/+7287
| | | | | | | | | | | | | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
* | | | Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
| | | | | | | | | | | | | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* | | | Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [skip appveyor] Change-Id: I700f70e734abb6264db29369ecf227a9e1f783e7
* | | | Add new files to Makefile.amFeng Xiao2015-12-141-24/+36
| | | |
* | | | Down-integrate from internal code base.Feng Xiao2015-12-11225-4970/+26872
|/ / /
* | | Merge pull request #1041 from thomasvl/use_xc7Thomas Van Lenten2015-12-1113-44/+80
|\ \ \ | | | | | | | | Update the min toolchain for iOS/OS X to be Xcode 7
| * | | Update the min toolchain for iOS/OS X to be Xcode 7Thomas Van Lenten2015-12-1013-44/+80
|/ / / | | | | | | | | | | | | | | | | | | - 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.
* | | Merge pull request #1039 from thomasvl/fix_cleansThomas Van Lenten2015-12-102-0/+2
|\ \ \ | | | | | | | | Fix distclean and maintainer-clean to get more generated files.
| * | | Fix dist_clean and maintainer-clean to get more generated files.Thomas Van Lenten2015-12-102-0/+2
|/ / /
* | | Merge pull request #1029 from keveman/masterJoshua Haberman2015-12-108-7/+91
|\ \ \ | | | | | | | | Enable fast cpp protos in the python interface.
| * | | Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
| | | | | | | | | | | | | | | | Fixes #1029
| * | | Made targets relative to google/protobufManjunath Kudlur2015-12-081-4/+4
| | | | | | | | | | | | | | | | Fixes #1029
| * | | Added util/python/BUILD to provide //util/python:python_headers dependency ↵Manjunath Kudlur2015-12-081-0/+8
| | | | | | | | | | | | | | | | for building use_fast_cpp_protos
| * | | Made building the python extension configurable via ↵Manjunath Kudlur2015-12-081-7/+24
| | | | | | | | | | | | | | | | --define=use_fast_cpp_protos=true
| * | | Updated for c++98 compatibilityManjunath Kudlur2015-12-076-5/+12
| | | |
| * | | Enable fast cpp protos in the python interface.Manjunath Kudlur2015-12-077-13/+53
| |/ /
* | | Merge pull request #1025 from Yangqing/masterFeng Xiao2015-12-091-47/+38
|\ \ \ | | | | | | | | Arena type traits standardization.
| * | | Minor changes to match the internal versionYangqing Jia2015-12-091-6/+7
| | | |
| * | | Arena type traits standardization.Yangqing Jia2015-12-051-47/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is adapted from the branch of @xfxyjwf at: https://github.com/xfxyjwf/protobuf/commit/494716a682ef854168e92231a3cdcc89d587d9b9 and should solve the protobuf compilation problem against nvcc. Tested against nvcc 6.5 and 7.0.
* | | | Merge pull request #1033 from c0nk/wip-implicit-cast-fixFeng Xiao2015-12-091-1/+1
|\ \ \ \ | | | | | | | | | | Fix narrowing implicit cast in generated message [NFC]
| * | | | Fix narrowing implicit cast in generated message [NFC]Kal Conley2015-12-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1030 from TeBoring/sandboxPaul Yang2015-12-0819-79/+91
|\ \ \ \ | | | | | | | | | | Use angle bracket for well known type proto header.
| * | | | Use angle bracket for well known type proto header.Bo Yang2015-12-0819-79/+91
| | | | |
* | | | | Merge pull request #1034 from thomasvl/static_assert_fixThomas Van Lenten2015-12-081-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Use compiler provided static assert and avoid tripping unused-local-typedef warnings.
| * | | | Use compiler provided static assert and avoid tripping unused-local-typedef ↵Thomas Van Lenten2015-12-081-4/+9
|/ / / / | | | | | | | | | | | | warnings.
* | | | Merge pull request #1027 from thomasvl/more_nullable_supportThomas Van Lenten2015-12-078-53/+156
|\ \ \ \ | |_|/ / |/| | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.
| * | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.Thomas Van Lenten2015-12-078-53/+156
|/ / /
* | | Merge pull request #1024 from martinmaly/wktJisi Liu2015-12-051-0/+3
|\ \ \ | | | | | | | | Making _genproto rules public.
| * | | Making _genproto rules public.Martin Maly2015-12-041-0/+3
| | | | | | | | | | | | | | | | | | | | This enables other xx_proto_library targets to depend on xx_proto_library targets in different packages, and specifically on xx_wkt_protos.