aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
|
* Update python conformance failure list.Feng Xiao2017-03-301-3/+0
|
* Update jenkins Java maven dependencies.Feng Xiao2017-03-301-1/+1
|
* Update C# conformance failure list.Feng Xiao2017-03-291-0/+4
|
* Update python conformance failure list.Feng Xiao2017-03-292-1181/+0
|
* Fix Java build.Feng Xiao2017-03-294-4/+11
|
* Update BUILD file for C# tests.Feng Xiao2017-03-291-0/+4
|
* Fix C++ build for down-integration.Feng Xiao2017-03-298-49/+134
|
* Down-integrate from google3.Feng Xiao2017-03-29251-5181/+13289
|
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
| | | See https://github.com/google/protobuf/issues/2425
* Merge pull request #2919 from thomasvl/drop_dispatchThomas Van Lenten2017-03-292-17/+20
|\ | | | | Remove the use of dispatch_once that is heap backed.
| * Remove the use of dispatch_once that is heap backed.Thomas Van Lenten2017-03-292-17/+20
|/ | | | | | | | | 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_3Thomas Van Lenten2017-03-291-0/+8
|\ | | | | Add support for Xcode 8.3 to the build helper.
| * Add support for Xcode 8.3 to the build helper.Thomas Van Lenten2017-03-291-0/+8
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresThomas Van Lenten2017-03-291-0/+2
|\ | | | | Add some new ignores for things generated in conformance.
| * Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
| |
* | Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
| | | | | | | | | | | | * Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression. * Updated per 80 character wrap.
* | Merge pull request #2914 from acozzette/naclAdam Cozzette2017-03-281-1/+8
|\ \ | |/ |/| Added a workaround to allow building for NaCl
| * Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
|/ | | | | | | 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.
* Merge pull request #2912 from thomasvl/objc_recursion_limitThomas Van Lenten2017-03-282-10/+23
|\ | | | | Raise the recursion limit to 100 to match other languages.
| * Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|/
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\ | | | | Changed go_package for plugin.proto.
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| |
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
| | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
* | Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-277-9/+237
|\ \ | | | | | | Conformance tests for JavaScript (Node.js). 15 tests are failing.
| * | Removed obsolete comments and added docs.Josh Haberman2017-03-162-5/+30
| | |
| * | Build system fixes for JS conformance tests.Josh Haberman2017-03-141-3/+5
| | |
| * | Conformance test for JS now work, though 15 tests fail.Josh Haberman2017-03-133-27/+49
| | |
| * | Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-065-1/+180
| | |
| * | WIP.Josh Haberman2017-03-061-4/+4
| | |
* | | Merge pull request #2884 from anandolee/masterJie Luo2017-03-273-19/+78
|\ \ \ | | | | | | | | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
| * | | Add FormatEnumAsInt support for Json Format. And scale ↵Jie Luo2017-03-243-19/+78
| | | | | | | | | | | | | | | | JsonFormatter.Settings to multiple options.
* | | | Merge pull request #2897 from cgrushko/patch-5Feng Xiao2017-03-221-0/+1
|\ \ \ \ | | | | | | | | | | Compile the Java proto runtime with Java 6
| * | | | Compile the Java proto runtime with Java 6cgrushko2017-03-221-0/+1
|/ / / / | | | | | | | | | | | | 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)Paul Yang2017-03-215-6/+8
| | | |
* | | | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-207-0/+209
|\ \ \ \ | | | | | | | | | | migrate delimited messages functions to util package
| * | | | Update BUILDBairen Yi2017-03-211-0/+1
| | | | |
| * | | | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| | | | |
| * | | | fix several issuesByron Yi2017-03-173-15/+15
| | | | |
| * | | | add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1
| | | | |
| * | | | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| | | | |
| * | | | migrate delimited messages functions to util packageByron Yi2017-03-166-0/+207
| | |_|/ | |/| |
* | | | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-203-90/+0
|\ \ \ \ | | | | | | | | | | Remove duplicated copyright statement
| * | | | Remove duplicated copyright statementprehistoric-penguin2017-03-163-90/+0
| |/ / /
* | | | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \ \ \ | | | | | | | | | | fix attributes warning
| * | | | fix attributes warningMarkus Heß2017-03-153-31/+31
| | | | |
* | | | | Merge pull request #2870 from acozzette/memcpy-memmoveAdam Cozzette2017-03-201-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Ruby: only link against specific version of memcpy if we're using glibc
| * | | | | Ruby: only link against specific version of memcpy if we're using glibcAdam Cozzette2017-03-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
| * | | | | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 09:39:17 +0000