aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Removes ignored const from return type (#2915)Gravatar Juan David Dominguez2017-03-29
| | | See https://github.com/google/protobuf/issues/2425
* Merge pull request #2919 from thomasvl/drop_dispatchGravatar Thomas Van Lenten2017-03-29
|\ | | | | Remove the use of dispatch_once that is heap backed.
| * Remove the use of dispatch_once that is heap backed.Gravatar Thomas Van Lenten2017-03-29
|/ | | | | | | | | Apple recently updated the docs on dispatch_once to point out that the storage for the dispatch_once_t must be static or global, but not something that was ever used before as the implementation doesn't use a memory barrier. So we drop the use and create the semaphore when needed and use an atomic swap deal with any threading races.
* Merge pull request #2918 from thomasvl/xcode_8_3Gravatar Thomas Van Lenten2017-03-29
|\ | | | | Add support for Xcode 8.3 to the build helper.
| * Add support for Xcode 8.3 to the build helper.Gravatar Thomas Van Lenten2017-03-29
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresGravatar Thomas Van Lenten2017-03-29
|\ | | | | Add some new ignores for things generated in conformance.
* | Fix gcc warning when using map (#2213)Gravatar drivehappy2017-03-28
| | | | | | | | | | | | * Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression. * Updated per 80 character wrap.
* | Merge pull request #2914 from acozzette/naclGravatar Adam Cozzette2017-03-28
|\ \ | | | | | | Added a workaround to allow building for NaCl
| * | Added a workaround to allow building for NaClGravatar Adam Cozzette2017-03-28
|/ / | | | | | | | | | | | | arm-nacl-clang seems to produce a mysterious compiler error when it encounters __builtin_clzll, so when we are building for NaCl, let's avoid that in favor of the portable implementation of Log2FloorNonZero64.
| * Add some new ignores for things generated in conformance.Gravatar Thomas Van Lenten2017-03-28
|/
* Merge pull request #2912 from thomasvl/objc_recursion_limitGravatar Thomas Van Lenten2017-03-28
|\ | | | | Raise the recursion limit to 100 to match other languages.
| * Raise the recursion limit to 100 to match other languages.Gravatar Thomas Van Lenten2017-03-28
|/
* Merge pull request #2858 from haberman/gopackageGravatar Joshua Haberman2017-03-27
|\ | | | | Changed go_package for plugin.proto.
* \ Merge pull request #1662 from haberman/jsconformanceGravatar Joshua Haberman2017-03-27
|\ \ | | | | | | Conformance tests for JavaScript (Node.js). 15 tests are failing.
* \ \ Merge pull request #2884 from anandolee/masterGravatar Jie Luo2017-03-27
|\ \ \ | | | | | | | | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
| * | | Add FormatEnumAsInt support for Json Format. And scale ↵Gravatar Jie Luo2017-03-24
| | | | | | | | | | | | | | | | JsonFormatter.Settings to multiple options.
* | | | Merge pull request #2897 from cgrushko/patch-5Gravatar Feng Xiao2017-03-22
|\ \ \ \ | | | | | | | | | | Compile the Java proto runtime with Java 6
| * | | | Compile the Java proto runtime with Java 6Gravatar cgrushko2017-03-22
|/ / / / | | | | | | | | | | | | in order to avoid errors related to generics when building user code in newer versions of Java.
* | | | Update commit number in Docker to update composer dependency (#2869)Gravatar Paul Yang2017-03-21
| | | |
* | | | Merge pull request #2861 from byronyi/#710Gravatar Adam Cozzette2017-03-20
|\ \ \ \ | | | | | | | | | | migrate delimited messages functions to util package
| * | | | Update BUILDGravatar Bairen Yi2017-03-21
| | | | |
* | | | | Merge pull request #2860 from prehistoric-penguin/masterGravatar Feng Xiao2017-03-20
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicated copyright statement
* \ \ \ \ \ Merge pull request #2854 from hesmar/attributesFixGravatar Adam Cozzette2017-03-20
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix attributes warning
* \ \ \ \ \ \ Merge pull request #2870 from acozzette/memcpy-memmoveGravatar Adam Cozzette2017-03-20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ruby: only link against specific version of memcpy if we're using glibc
* \ \ \ \ \ \ \ Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
| | * | | | | | | Ruby: only link against specific version of memcpy if we're using glibcGravatar Adam Cozzette2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some special code in wrap_memcpy.c to ensure that we use the 2.2.5 version of memcpy, for compatibility with older versions of glibc. However, we need to make sure we only attempt to do this when we are actually building with glibc, so that the code can also build successfully against other libc implementations such as musl.
* | | | | | | | | Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | DefaultValueObjectWriter should populate oneof message field
* | | | | | | | | Add file option php_class_prefix (#2849)Gravatar Paul Yang2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option will be prepended to generated classes of all messages in the containing file.
* | | | | | | | | Merge pull request #2848 from xfxyjwf/freebsdGravatar Feng Xiao2017-03-17
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix freebsd build.
| | | | | | * | | Update delimited_message_util_test.ccGravatar Bairen Yi2017-03-18
| | | | | | | | |
| | | * | | | | | Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
| | | | | | | | |
| | | * | | | | | Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
| |_|/ / / / / / |/| | | | | | |
| | | | | * | | fix several issuesGravatar Byron Yi2017-03-17
| | | | | | | |
* | | | | | | | Merge pull request #2866 from xfxyjwf/nanoGravatar Feng Xiao2017-03-16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a notice for nano.
| * | | | | | | | Add a notice for nano.Gravatar Feng Xiao2017-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer supports nano and recommend protobuf lite over nano for Android users.
| | | | | | | * | Removed obsolete comments and added docs.Gravatar Josh Haberman2017-03-16
| | | | | | | | |
| | | | | | | | * Properly regenerated descriptor.proto.Gravatar Josh Haberman2017-03-16
| | | | | | | | |
* | | | | | | | | Merge pull request #2859 from haberman/junit-dep-scopeGravatar Joshua Haberman2017-03-16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Changed scope of Java deps to "test".
* \ \ \ \ \ \ \ \ \ Merge pull request #2847 from haberman/ruby-tohGravatar Joshua Haberman2017-03-16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ruby: fixed Message#to_h for map fields.
* \ \ \ \ \ \ \ \ \ \ Merge pull request #2794 from acozzette/jspb-extensionsGravatar Adam Cozzette2017-03-16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | JS: ensure that extension values are serialized even if they're falsy
| | | | | | | | | * | | add delimited_message_util.cc to libprotobuf.cmakeGravatar Byron Yi2017-03-16
| | | | | | | | | | | |
| | | | | | | | | * | | add LIBPROTOBUF_EXPORT to make msvc happyGravatar Byron Yi2017-03-16
| | | | | | | | | | | |
| | | | | | | | | * | | migrate delimited messages functions to util packageGravatar Byron Yi2017-03-16
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| | | | | | | | * | | Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| | | * | | | | | | Changed scope of Java deps to "test".Gravatar Josh Haberman2017-03-15
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This is per: https://github.com/google/protobuf/issues/2019
| | | | | | | | * Changed go_package for plugin.proto.Gravatar Josh Haberman2017-03-15
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
* | | | | | | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutGravatar Joshua Haberman2017-03-15
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | compiler/cli: PrintHelpText prints to stdout instead of stderr
* | | | | | | | Incremented Ruby version number to 3.2.0.1Gravatar Adam Cozzette2017-03-15
| | | | | | | |
* | | | | | | | Ruby: update Gemspec.Gravatar Josh Haberman2017-03-15
| | | | | | | |