aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add fixed version to phpunit used in travis (#2673)Paul Yang2017-02-071-1/+1
|
* Merge pull request #2681 from sergiocampama/spacesThomas Van Lenten2017-02-072-55/+55
|\ | | | | Removes trailing whitespaces
| * Removes trailing whitespacesSergio Campama2017-02-072-55/+55
|/
* Update upb for php. (#2662)Paul Yang2017-02-064-936/+2245
|
* Fix CopyTo argument validationJon Skeet2017-02-062-2/+18
| | | | Fixes #2669.
* Add conformance test for php (#2655)Paul Yang2017-02-016-7/+1422
|
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-31146-4556/+6828
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* Merge pull request #2226 from kchodorow/masterJoshua Haberman2017-01-301-6/+24
|\ | | | | Create paths for external repositories in a way that is forward and backward compatible
| * Update genfiles paths to work with a different execroot arrangementKristina Chodorow2017-01-251-6/+24
| | | | | | | | | | | | Bazel is changing the way the execution root is organized (see https://github.com/bazelbuild/bazel/issues/1681 for details) and this updates the protobuf path logic to work with both old and new versions of Bazel.
* | C#: Implement IReadOnlyList<T> in RepeatedField<T>Jon Skeet2017-01-301-0/+3
| | | | | | | | | | | | | | | | We explicitly don't do this when targeting .NET 3.5, where the interface doesn't exist. No implementation is required, as we're already implementing everything we need for IList<T>.
* | Merge pull request #2639 from anandolee/masterJie Luo2017-01-283-116/+116
|\ \ | | | | | | Add Oneof custom options test
| * | Add Oneof custom options testJie Luo2017-01-273-116/+116
| | |
* | | fix compile error on centos in metadata.h for constructors. (#2599)michaelpengcn2017-01-271-2/+4
| | |
* | | Oneof accessor should return the field name that is actually set. (#2631)Paul Yang2017-01-276-2/+61
|/ /
* | Merge pull request #2619 from anandolee/masterJie Luo2017-01-2732-1/+5851
|\ \ | | | | | | Add python compatibility tests against v2.5.0
| * | Add python compatibility tests against v2.5.0 amd run on Travis.Jie Luo2017-01-266-4/+220
| | |
| * | Add python compatibility tests against v2.5.0: copy tests and proto files ↵Jie Luo2017-01-2328-0/+5634
| | | | | | | | | | | | from v2.5.0
* | | Merge pull request #2633 from anandolee/jieluo_branch1Jie Luo2017-01-261-1/+1
|\ \ \ | | | | | | | | Allow OneofOptions to be extended in proto3.
| * | | Allow OneofOptions to be extended in proto3.Jie Luo2017-01-251-1/+1
| |/ /
* | | Merge pull request #2626 from sergiocampama/8_3Thomas Van Lenten2017-01-252-242/+242
|\ \ \ | | | | | | | | | | | | | | | | Adds nullability modifiers to resolve Xcode 8.3 warnings Fixes #2625
| * | | Adds nullability modifiers to resolve Xcode 8.3 warningsSergio Campama2017-01-252-242/+242
|/ / /
* | | Merge pull request #2614 from acozzette/gzip-output-stream-optionsAdam Cozzette2017-01-231-1/+1
|\ \ \ | | | | | | | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options
| * | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2017-01-201-1/+1
|/ / / | | | | | | | | | This fixes issue #2610.
* / / Support custom options in C#Jon Skeet2017-01-1917-14/+3727
|/ / | | | | | | | | | | | | | | | | | | | | | | This consists of: - Changing the codegen for the fixed set of options protos, to parse unknown fields instead of skipping them - Add a new CustomOptions type in the C# support library - Expose CustomOptions properties from the immutable proto wrappers in the support library Only single-value options are currently supported, and fetching options values requires getting the type right and knowing the field number. Both of these can be addressed at a later time. Fixes #2143, at least as a first pass.
* | Merge pull request #2591 from thomasvl/objc_timestamps_take2Thomas Van Lenten2017-01-173-71/+160
|\ \ | |/ |/| Timestamp helper fix, Duration helper cleanup.
| * Timestamp helper fix, Duration helper cleanup.Thomas Van Lenten2017-01-123-71/+160
|/ | | | | | | | | - The Timestamp proto does not allow for negative nanos fields, so the seconds must be shifted and a positive nanos then applied. - Tweak the helpers on Duration to make it clear there is no "base" time involved. - Update the unittests for duration and timestamp to cover positive and negative NSTimeIntervals and what their impact is on the protos.
* Merge pull request #2587 from google/revert-2586-objc_timestampThomas Van Lenten2017-01-122-57/+33
|\ | | | | Revert "Fix Timestamps with dates before the Unix epoch that contain fractional seconds."
| * Revert "Fix Timestamps with dates before the Unix epoch that contain ↵Thomas Van Lenten2017-01-122-57/+33
|/ | | | fractional seconds."
* Merge pull request #2586 from thomasvl/objc_timestampThomas Van Lenten2017-01-122-33/+57
|\ | | | | Fix Timestamps with dates before the Unix epoch that contain fractional seconds.
| * Fix Timestamps with dates before the Unix epoch that contain fractional seconds.Thomas Van Lenten2017-01-122-33/+57
|/ | | | | The Timestamp proto does not allow for negative nanos fields, so the seconds must be shifted and a positive nanos then applied.
* Merge pull request #2584 from cgrushko/patch-2Feng Xiao2017-01-121-1/+8
|\ | | | | Add a proto_lang_toolchain for Java
| * Add a proto_lang_toolchain for Javacgrushko2017-01-121-1/+8
|/ | | This allows easy use of Bazel's java_proto_library native rule.
* Merge pull request #2529 from wackoisgod/masterAdam Cozzette2017-01-123-2/+15
|\ | | | | Class deprecation support
| * Fixing code formatting issuesAndrew Spiering2017-01-112-14/+5
| |
| * Merge branch 'master' of https://github.com/wackoisgod/protobufAndrew Spiering2017-01-110-0/+0
| |
| * Added the support for class level deprecation which will in turn also ↵Andrew Spiering2016-12-213-0/+22
| | | | | | | | deprecate any fields that are currently using that type
* | Merge pull request #2567 from acozzette/distcheck-fixAdam Cozzette2017-01-101-2/+4
|\ \ | | | | | | Fixed "make distcheck" for the Autotools build
| * | Fixed "make distcheck" for the Autotools buildAdam Cozzette2017-01-091-2/+4
| | | | | | | | | | | | | | | To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES.
* | | Add ByteString.FromStream and ByteString.FromStreamAsync in C#Jon Skeet2017-01-103-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2088. We now have separate tests for netcoreapp and net45 to test the two branches here. (netstandard10 doesn't have MemoryStream.GetBuffer) Although most of this library doesn't have any async functionality, this feels like a natural place to locally add it.
* | | Add global.json file to pick dotnet core SDK version.Jon Skeet2017-01-102-0/+6
|/ /
* | PHP fix int64 decoding (#2516)Sufir2017-01-082-28/+77
| | | | | | | | | | | | * fix int64 decoding * fix int64 decoding + tests
* | Fix generation of extending nested messages in JavaScript (#2439)Marcus Longmuir2017-01-064-7/+74
| | | | | | | | | | | | * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build
* | A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-062-12/+35
| | | | | | | | | | | | | | | | | | | | | | * A few more cases for binary conformance tests. * over-encoded varints (encoded in more bytes than are necessary). * truncated varints (>32 bits for 32-bit types). * Fixed Python decoding bug with 32-bit varints. * Fixed 1L -> 1LL for 32-bit platforms.
* | Merge pull request #2565 from acozzette/cross-compilationAdam Cozzette2017-01-054-3/+242
|\ \ | | | | | | Fixed cross compilations with the Autotools build
| * | Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-034-3/+242
| | | | | | | | | | | | | | | | | | | | | | | | Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed.
* | | Merge pull request #2563 from thomasvl/autocreator_tweaksThomas Van Lenten2017-01-0511-16/+435
|\ \ \ | | | | | | | | Minor fix for autocreated object repeated fields and maps.
| * | | Minor fix for autocreated object repeated fields and maps.Thomas Van Lenten2017-01-0511-16/+435
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list.
* | | Merge pull request #2544 from tiziano88/masterAdam Cozzette2017-01-041-0/+1
|\ \ \ | | | | | | | | Add link to Elm proto plugin
| * | | Add link to Elm proto pluginTiziano Santoro2016-12-281-0/+1
| | | |
* | | | Merge pull request #2536 from jbrianceau/fix-js-embed-include-styleAdam Cozzette2017-01-041-1/+1
|\ \ \ \ | | | | | | | | | | Fix include in auto-generated well_known_types_embed.cc
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 20:21:36 +0000