aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4044 from xfxyjwf/issue3268Feng Xiao2017-12-1313-39/+39
|\ | | | | Avoid double underscores in macro name
| * Update generated code.Feng Xiao2017-12-1312-36/+36
| |
| * Avoid two consecutive underscores in macro name.Feng Xiao2017-12-131-3/+3
| | | | | | | | Fixes https://github.com/google/protobuf/issues/3268
* | Merge pull request #4041 from acozzette/fix-license-issue-1775Adam Cozzette2017-12-132-1/+60
|\ \ | | | | | | Added our standard license header to structurally_valid.cc and its test
| * | Added our standard license header to structurally_valid.cc and its testAdam Cozzette2017-12-132-1/+60
| | | | | | | | | | | | This fixes issue #1775.
* | | Add unknown field support for csharp (#3936)Jie Luo2017-12-1332-345/+3017
| |/ |/| | | Add unknown field support for csharp
* | Merge pull request #4037 from xfxyjwf/issue2880Feng Xiao2017-12-131-4/+4
|\ \ | |/ |/| Clarify default value behavior in JSON conversion.
| * Clarify default value behavior in JSON conversion.Feng Xiao2017-12-121-4/+4
| | | | | | | | Make it clear default value is only omitted for proto3.
* | Merge pull request #4036 from xfxyjwf/issue3093Feng Xiao2017-12-123-3/+9
|\ \ | | | | | | Update comments for Timestamp JSON format.
| * | Update generated code.Feng Xiao2017-12-122-2/+6
| | |
| * | Update comments for Timestamp JSON format.Feng Xiao2017-12-121-1/+3
| |/ | | | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093
* | Merge pull request #4016 from jquesnelle/string-access-ubJisi Liu2017-12-121-4/+5
|\ \ | | | | | | fix undefined behavior in C++03
| * | use const char* instead of const std::string& in normalize()Jeffrey Quesnelle2017-12-071-5/+5
| | |
| * | fix undefined behavior in C++03Jeffrey Quesnelle2017-12-071-4/+5
| | |
* | | Merge pull request #2834 from aj-michael/masterJisi Liu2017-12-121-0/+1
|\ \ \ | |_|/ |/| | Make //:protobuf_python have correct __init__.py.
| * | Make //:protobuf_python have correct __init__.py.Adam Michael2017-03-101-0/+1
| | | | | | | | | | | | | | | Previously //:protobuf_python set no __init__.py so Bazel created an empty one. This change makes it use the __init__.py from the repository.
* | | Regenerated code from previous C# codegen commitJon Skeet2017-12-096-34/+34
| | | | | | | | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725.
* | | C# code generation changes to use bitwise comparisons for doublesJon Skeet2017-12-092-12/+30
| | |
* | | Compare floating point values bitwise in C#Jon Skeet2017-12-0911-14/+405
| | | | | | | | | | | | | | | This is the manual code part of the Google.Protobuf library, and tests. Some tests will fail until codegen is changed and rerun.
* | | Merge pull request #4007 from graywolf/patch-1Adam Cozzette2017-12-081-4/+0
|\ \ \ | | | | | | | | --pre is not necessary
| * | | --pre is not necessaryW2017-12-061-4/+0
| | |/ | |/| | | | --pre was not necessary to install google-protobuf when I tried it today (2017-12-06).
* | | Merge pull request #4000 from Kwizatz/masterAdam Cozzette2017-12-081-2/+2
|\ \ \ | | | | | | | | Using binary one's complement to negate an unsigned int
| * | | Using binary one's complement to negate an unsigned intRodrigo Hernandez2017-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned.
* | | | Merge pull request #4017 from acozzette/update-file-listsAdam Cozzette2017-12-082-0/+2
|\ \ \ \ | | | | | | | | | | Ran update_file_lists.sh to update Bazel and CMake file lists
| * | | | Ran update_file_lists.sh to update Bazel and CMake file listsAdam Cozzette2017-12-072-0/+2
| | |/ / | |/| | | | | | | | | | | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc).
* | | | Merge pull request #4018 from acozzette/android-portable-log2-floorAdam Cozzette2017-12-081-4/+12
|\ \ \ \ | |/ / / |/| | | Use the portable version of Log2Floor for Clang with older Android NDK versions
| * | | Use the portable version of Log2Floor for Clang with older Android NDK versionsAdam Cozzette2017-12-071-4/+12
|/ / / | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl.
* | | Merge pull request #3988 from acozzette/down-integrateAdam Cozzette2017-12-05142-3270/+4456
|\ \ \ | | | | | | | | Integrated internal changes from Google
| * | | Fixed failing JS testsAdam Cozzette2017-12-054-11/+3
| | | |
| * | | Updated conformance failure listsAdam Cozzette2017-12-043-9/+0
| | | |
| * | | Updated Makefile.am to add a new file to EXTRA_DISTAdam Cozzette2017-12-011-0/+1
| | | |
| * | | Merge branch 'master' into down-integrateAdam Cozzette2017-12-01135-5818/+2910
| |\ \ \
| * | | | Integrated internal changes from GoogleAdam Cozzette2017-12-01143-3272/+4483
| | | | |
* | | | | Merge pull request #3926 from BSBandme/down_sync_benchmarkYilun Chong2017-12-0529-464/+8661
|\ \ \ \ \ | |_|_|/ / |/| | | | Sync benchmark changes from internal
| * | | | Fix bugs to pass testsYilun Chong2017-12-042-8/+13
| | | | |
| * | | | Sync internal benchmark changesYilun Chong2017-12-0128-459/+8651
| | |/ / | |/| |
* | | | Merge pull request #3968 from fahhem/patch-2Feng Xiao2017-12-042-0/+14
|\ \ \ \ | | | | | | | | | | Add a check_version() for use in WORKSPACEs
| * | | | Add a check_protobuf_required_bazel_version() for use in WORKSPACEsFahrzin Hemmati2017-12-042-0/+14
| | | | |
* | | | | Remove Xcode directives on some configs.Thomas Van Lenten2017-12-041-8/+0
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Travis changed their default image: https://blog.travis-ci.com/2017-11-21-xcode8-3-default-image-announce So there is no need to set a specific image any more, and the non apple language tests should be able to use the default images.
* | | | Merge pull request #3979 from acozzette/3.5.x-mergeAdam Cozzette2017-12-0156-252/+291
|\ \ \ \ | |/ / / |/| | | Merge 3.5.x branch into master
| * | | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-3056-252/+291
|/| | |
| * | | Remove duplicate typedef. (#3975)Paul Yang2017-11-301-19/+7
| | | |
| * | | Provide discardUnknonwnFields API in php (#3976)Paul Yang2017-11-305-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension.
| * | | Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
| | | |
| * | | Merge pull request #3941 from google/anandolee-patch-2Jisi Liu2017-11-221-1/+10
| |\ \ \ | | | | | | | | | | Add _file_desc_by_toplevel_extension back
| | * | | Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1. _file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file. FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years.
| * | | Update version number for php c extension (#3896)Paul Yang2017-11-152-4/+20
| | | |
| * | | Merge pull request #3895 from pherl/3.5.xJisi Liu2017-11-151-1/+1
| |\ \ \ | | | | | | | | | | Add protobuf-all in post release
| | * | | Add protobuf-all in post releaseJisi Liu2017-11-151-1/+1
| | | | |
| * | | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)Paul Yang2017-11-151-4/+3
| |/ / / | | | | | | | | conflict
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 14:52:14 +0000