aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-3191-2996/+3458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 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-271-1/+1
|
* 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
| |
* | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2017-01-201-1/+1
| | | | | | | | This fixes issue #2610.
* | Support custom options in C#Jon Skeet2017-01-192-4/+34
|/ | | | | | | | | | | | 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 #2529 from wackoisgod/masterAdam Cozzette2017-01-123-2/+15
|\ | | | | Class deprecation support
| * Fixing code formatting issuesAndrew Spiering2017-01-112-14/+5
| |
| * 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
* | 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.
* | Fix generation of extending nested messages in JavaScript (#2439)Marcus Longmuir2017-01-061-7/+12
| | | | | | | | | | | | * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build
* | Merge pull request #2565 from acozzette/cross-compilationAdam Cozzette2017-01-051-3/+6
|\ \ | | | | | | Fixed cross compilations with the Autotools build
| * | Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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 #2536 from jbrianceau/fix-js-embed-include-styleAdam Cozzette2017-01-041-1/+1
|\ \ \ | | | | | | | | Fix include in auto-generated well_known_types_embed.cc
| * | | Fix include in auto-generated well_known_types_embed.ccJulien Brianceau2016-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc
* | | | Removed arena_nc.cc and arena_nc_test.pyAdam Cozzette2017-01-042-106/+0
| |/ / |/| | | | | | | | | | | This test is undocumented and it looks like it has probably never worked. Let's just remove it to tidy things up. This fixes issue #2515.
* | | Fix warning in compiler/js/embed.ccJulien Brianceau2016-12-271-1/+1
|/ / | | | | | | | | | | | | 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) { ^
* | Merge pull request #2523 from jbrianceau/init-index-in-metadataAdam Cozzette2016-12-221-9/+12
|\ \ | | | | | | Init index_in_metadata_ without condition
| * | Init index_in_metadata_ without conditionJulien Brianceau2016-12-211-9/+12
| |/ | | | | | | | | | | Chromium MemorySanitizer (MSan) reports use-of-uninitialized-value of index_in_metadata_ attribute from EnumGenerator class. Fix these warnings by initializing these attributes without condition.
* | simpler, cheaper callback to LazyStringOutputStreamCamillo Lugaresi2016-12-211-14/+2
| |
* | add MethodResultCallback_0_0Camillo Lugaresi2016-12-211-0/+30
|/
* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upAdam Cozzette2016-12-201-1/+2
|
* Updated Makefile.am to fix out-of-tree buildsAdam Cozzette2016-12-201-1/+4
|
* Merge pull request #2506 from ckennelly/rvalue-settersAdam Cozzette2016-12-1913-1/+942
|\ | | | | Add rvalue setters for non-arena strings on C++11.
| * Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-1613-1/+942
| |
* | Merge pull request #2505 from ckennelly/masterAdam Cozzette2016-12-191-11/+4
|\ \ | | | | | | Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
| * | Remove spurious NULL checks in ArenaStringPtr::CreateInstance.Chris Kennelly2016-12-151-11/+4
| |/
* | Auto-generate well_known_types_embed.ccAdam Cozzette2016-12-193-325/+20
| | | | | | | | | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc.
* | Merge pull request #2227 from KindDragon/3.1.xFeng Xiao2016-12-164-41/+43
|\ \ | |/ |/| Missed LIBPROTOC_EXPORT for GRPC added
| * LIBPROTOC_EXPORT added to others functions in csharp_names.h and ↵Arkadiy Shapkin2016-12-012-33/+33
| | | | | | | | objectivec_helpers.h
| * Missed LIBPROTOC_EXPORT for GRPC addedArkadiy Shapkin2016-12-014-8/+10
| |
* | Define LANG_CXX11 for port.h and use this to guard C++11 features.Chris Kennelly2016-12-142-2/+11
| |
* | Merge pull request #2495 from acozzette/android-hashAdam Cozzette2016-12-142-9/+3
|\ \ | | | | | | Removed Android-specific code from stubs/hash.h
| * | Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-132-9/+3
| | | | | | | | | | | | | | | | | | | | | This #ifdef in hash.h causes us to give up on finding a hash function on Android, when there do seem to be hash functions available in practice. I also had to tweak a macro in map.h that was disabling on Android an allocator construct() method that we need.
* | | Merge pull request #2496 from xyzzyz/fix-overflowFeng Xiao2016-12-131-1/+1
|\ \ \ | | | | | | | | Fix integer overflow in FastUInt32ToBufferLeft
| * | | Fix integer overflow in FastUInt32ToBufferLeftAdam Michalik2016-12-131-1/+1
| |/ / | | | | | | | | | | | | If digits > 2, and int is 32 bit, line 999 overflows. It has been fixed internally in CL 41203823.
* | | Merge pull request #2493 from jbrianceau/add-missing-climits-includeFeng Xiao2016-12-133-0/+3
|\ \ \ | | | | | | | | Add missing includes
| * | | Add missing include in embed.ccJulien Brianceau2016-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | This changes fixes "error C2039: 'getline': is not a member of 'std'" compilation error.
| * | | Add missing includesJulien Brianceau2016-12-132-0/+2
| | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
* | | | Merge pull request #2484 from ngg/uwp_buildFeng Xiao2016-12-1316-94/+95
|\ \ \ \ | |_|/ / |/| | | Add support for Windows ARM builds
| * | | Add support for Windows ARM buildsGergely Nagy2016-12-1216-94/+95
| | | |
* | | | Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-131-1/+1
|\ \ \ \ | |_|/ / |/| | | remove leading whitespace in C# xml comments
| * | | remove leading whitespace in C# xml commentsJan Tattermusch2016-12-121-1/+1
| | | |
* | | | Merge pull request #2471 from jbrianceau/fix-include-styleFeng Xiao2016-12-121-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix #include in cc files
| * | | Fix #include in cc filesJulien Brianceau2016-12-091-1/+1
| | | |
* | | | Merge pull request #2454 from pongad/go_packageFeng Xiao2016-12-122-5/+6
|\ \ \ \ | |_|/ / |/| | | update descriptor.proto's go_package
| * | | update descriptor.proto's go_packageMichael Darakananda2016-12-072-5/+6
| | | | | | | | | | | | | | | | | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* | | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macroAdam Cozzette2016-12-091-4/+4
| |/ / |/| | | | | | | | | | | | | | | | | There have been some reports that this necessary to prevent build failures in some environments. It makes sense to do this anyway since the result of this macro is ultimately assigned to uint32 in the generated code.
* | | Update commit id in Dockerfile to trigger update. (#2467)Paul Yang2016-12-081-3/+0
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 21:44:04 +0000