aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Build Java conformance tests for JDK7 only.Gravatar Feng Xiao2015-12-21
| | | | | | The Java conformance test class uses JDK7+ only syntaxes and can't compile with JDK6. [skip ci]
* Exclude failing objc conformance tests.Gravatar Feng Xiao2015-12-21
| | | | [skip ci]
* Only try to install GCC 4.8 on Linux.Gravatar Feng Xiao2015-12-21
|
* Fix Java travis tests.Gravatar Feng Xiao2015-12-21
|
* Merge branch master into v3.0.0-beta-2Gravatar Feng Xiao2015-12-21
|\
* | Configure conformance tests to build with C++11 (require GCC 4.8)Gravatar Feng Xiao2015-12-21
| | | | | | | | [skip ci]
| * Merge pull request #1062 from rinatz/masterGravatar Feng Xiao2015-12-18
| |\ | | | | | | Fix static non-pod type problem with dlopen
| | * Initialize singleton instance by GoogleOnceInit()Gravatar Kenichiro IDA2015-12-19
| | |
| * | Merge pull request #1059 from jtattermusch/add_refgen_dependencyGravatar Jan Tattermusch2015-12-17
| |\ \ | | | | | | | | Add reference generator dependency
| * \ \ Merge pull request #1060 from thomasvl/drop_spinlocksGravatar Thomas Van Lenten2015-12-17
| |\ \ \ | | | | | | | | | | Drop all use of OSSpinLock
| | * | | Drop all use of OSSpinLockGravatar Thomas Van Lenten2015-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/masterGravatar Feng Xiao2015-12-17
| |\ \ \ \ | | |/ / / | |/| | | Add region tags to the Go protobuf examples.
| | | * | add reference generator dependencyGravatar Jan Tattermusch2015-12-17
| | |/ / | |/| |
| * | | Merge pull request #1049 from jskeet/any-formatGravatar Jon Skeet2015-12-17
| |\ \ \ | | | | | | | | | | Handle Any formatting for diagnostic purposes
| | | * | Improves readability of Go example test.Gravatar Tim Swast2015-12-16
| | | | |
* | | | | Make conformance tests build for C++ and Java.Gravatar Feng Xiao2015-12-16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
| * | | | Merge pull request #1051 from jtattermusch/support_coreclrGravatar Jan Tattermusch2015-12-16
| |\ \ \ \ | | | | | | | | | | | | Make nuget package support coreCLR
| * \ \ \ \ Merge pull request #1026 from jskeet/any-conformanceGravatar Jan Tattermusch2015-12-16
| |\ \ \ \ \ | | | | | | | | | | | | | | Add JSON parsing to conformance tests.
| | | * | | | make nuget package support CoreCLRGravatar Jan Tattermusch2015-12-16
| | |/ / / / | |/| | | |
| | | | | * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Gravatar Kenichiro IDA2015-12-17
| | |_|_|/ | |/| | |
| | * | | Add JSON parsing to conformance tests.Gravatar Jon Skeet2015-12-16
| |/ / /
| | | * Add region tags to the Go protobuf examples.Gravatar Tim Swast2015-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Generated code changes from previous commit.Gravatar Jon Skeet2015-12-15
| | | |
| | * | Make ToString() valid without a type registryGravatar Jon Skeet2015-12-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
| | | | | | | | | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* | | Remove the usage of C++11 override.Gravatar Feng Xiao2015-12-14
| | | | | | | | | | | | | | | | | | [skip appveyor] Change-Id: I700f70e734abb6264db29369ecf227a9e1f783e7
* | | Add new files to Makefile.amGravatar Feng Xiao2015-12-14
| | |
| * | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagGravatar Feng Xiao2015-12-12
| |\ \ | | | | | | | | MSVC MP flag to build with multiple processes in visual studio.
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|/ / /
* | | Merge pull request #1041 from thomasvl/use_xc7Gravatar Thomas Van Lenten2015-12-11
|\ \ \ | | | | | | | | Update the min toolchain for iOS/OS X to be Xcode 7
| * | | Update the min toolchain for iOS/OS X to be Xcode 7Gravatar Thomas Van Lenten2015-12-10
|/ / / | | | | | | | | | | | | | | | | | | - 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_cleansGravatar Thomas Van Lenten2015-12-10
|\ \ \ | | | | | | | | Fix distclean and maintainer-clean to get more generated files.
| * | | Fix dist_clean and maintainer-clean to get more generated files.Gravatar Thomas Van Lenten2015-12-10
|/ / /
* | | Merge pull request #1029 from keveman/masterGravatar Joshua Haberman2015-12-10
|\ \ \ | | | | | | | | Enable fast cpp protos in the python interface.
* \ \ \ Merge pull request #1025 from Yangqing/masterGravatar Feng Xiao2015-12-09
|\ \ \ \ | | | | | | | | | | Arena type traits standardization.
| * | | | Minor changes to match the internal versionGravatar Yangqing Jia2015-12-09
| | | | |
* | | | | Merge pull request #1033 from c0nk/wip-implicit-cast-fixGravatar Feng Xiao2015-12-09
|\ \ \ \ \ | | | | | | | | | | | | Fix narrowing implicit cast in generated message [NFC]
| | | * | | Bringing in internal::shared_ptr into google:protobuf namespace.Gravatar Manjunath Kudlur2015-12-09
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1029
| * | | | | Fix narrowing implicit cast in generated message [NFC]Gravatar Kal Conley2015-12-08
| | | | | |
* | | | | | Merge pull request #1030 from TeBoring/sandboxGravatar Paul Yang2015-12-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use angle bracket for well known type proto header.
| * | | | | | Use angle bracket for well known type proto header.Gravatar Bo Yang2015-12-08
| | | | | | |
* | | | | | | Merge pull request #1034 from thomasvl/static_assert_fixGravatar Thomas Van Lenten2015-12-08
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use compiler provided static assert and avoid tripping unused-local-typedef warnings.
| * | | | | | Use compiler provided static assert and avoid tripping unused-local-typedef ↵Gravatar Thomas Van Lenten2015-12-08
|/ / / / / / | | | | | | | | | | | | | | | | | | warnings.
| | | * | | Made targets relative to google/protobufGravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1029
| | | * | | Added util/python/BUILD to provide //util/python:python_headers dependency ↵Gravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | for building use_fast_cpp_protos
| | | * | | Made building the python extension configurable via ↵Gravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | --define=use_fast_cpp_protos=true
| | | * | | Updated for c++98 compatibilityGravatar Manjunath Kudlur2015-12-07
| | | | | |
| | | * | | Enable fast cpp protos in the python interface.Gravatar Manjunath Kudlur2015-12-07
| |_|/ / / |/| | | |
| | | * | MSVC MP flag to build with multiple processes in visual studio.Gravatar Benjamin Bennett2015-12-07
| |_|/ / |/| | |
* | | | Merge pull request #1027 from thomasvl/more_nullable_supportGravatar Thomas Van Lenten2015-12-07
|\ \ \ \ | | | | | | | | | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.