aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Update protoc-artfactsJisi Liu2017-11-131-5/+6
| | |
| * | Merge branch '3.5.x' of github.com:google/protobuf into 3.5.xJisi Liu2017-11-135-9/+67
| |\ \
| | * \ Merge pull request #3868 from pherl/3.5.xv3.5.0Jisi Liu2017-11-1313-29/+22
| | |\ \ | | | | | | | | | | Support win32 long path for cross compiled build
| | * | | All integer types should accept null in json. (#3869)Paul Yang2017-11-132-5/+22
| | | | |
| | * | | Merge pull request #3867 from jtattermusch/update_changelogJisi Liu2017-11-101-0/+1
| | |\ \ \ | | | | | | | | | | | | Update changelog
| | | * | | update changelogJan Tattermusch2017-11-101-0/+1
| | |/ / /
| | * | | Merge pull request #3861 from jtattermusch/backport_3858Jisi Liu2017-11-102-4/+44
| | |\ \ \ | | | | | | | | | | | | Backport #3858 to 3.5.x branch
| | | * | | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-101-0/+14
| | | | | |
| | | * | | check already performed by MergeFromJan Tattermusch2017-11-101-5/+0
| | | | | |
| | | * | | allow message parsing from an array sliceJan Tattermusch2017-11-102-0/+31
| | |/ / /
| * | / / Update release dateJisi Liu2017-11-131-3/+3
| | |/ / | |/| |
| * | | Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
| |/ /
| * | Fix arm64 nameJisi Liu2017-11-091-2/+2
| | |
| * | Supports Arm64 (aarch64) protoc artifactsJisi Liu2017-11-092-1/+16
| | |
| * | Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-084-131/+2
| |\ \ | | | | | | | | Fix Atomic32/AtomicWord on some platforms.
| | * | Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-084-131/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms.
| * | | Provide util funtions to figure out correct php class names. (#3850)Paul Yang2017-11-082-9/+36
| |/ /
| * | Merge pull request #3835 from pherl/3.5.xJisi Liu2017-11-0826-43/+118
| |\ \ | | | | | | | | Update version number to 3.5.0
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-03 04:44:15 +0000