aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #2834 from aj-michael/masterGravatar Jisi Liu2017-12-12
|\ | | | | Make //:protobuf_python have correct __init__.py.
* | Regenerated code from previous C# codegen commitGravatar Jon Skeet2017-12-09
| | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725.
* | C# code generation changes to use bitwise comparisons for doublesGravatar Jon Skeet2017-12-09
| |
* | Compare floating point values bitwise in C#Gravatar Jon Skeet2017-12-09
| | | | | | | | | | 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-1Gravatar Adam Cozzette2017-12-08
|\ \ | | | | | | --pre is not necessary
* \ \ Merge pull request #4000 from Kwizatz/masterGravatar Adam Cozzette2017-12-08
|\ \ \ | | | | | | | | Using binary one's complement to negate an unsigned int
* \ \ \ Merge pull request #4017 from acozzette/update-file-listsGravatar Adam Cozzette2017-12-08
|\ \ \ \ | | | | | | | | | | Ran update_file_lists.sh to update Bazel and CMake file lists
* \ \ \ \ Merge pull request #4018 from acozzette/android-portable-log2-floorGravatar Adam Cozzette2017-12-08
|\ \ \ \ \ | | | | | | | | | | | | 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 versionsGravatar Adam Cozzette2017-12-07
|/ / / / / | | | | | | | | | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl.
| * / / / Ran update_file_lists.sh to update Bazel and CMake file listsGravatar Adam Cozzette2017-12-07
|/ / / / | | | | | | | | | | | | | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc).
| * | | Using binary one's complement to negate an unsigned intGravatar Rodrigo Hernandez2017-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned.
| | * | --pre is not necessaryGravatar W2017-12-06
| |/ / |/| | | | | --pre was not necessary to install google-protobuf when I tried it today (2017-12-06).
* | | Merge pull request #3988 from acozzette/down-integrateGravatar Adam Cozzette2017-12-05
|\ \ \ | | | | | | | | Integrated internal changes from Google
* \ \ \ Merge pull request #3926 from BSBandme/down_sync_benchmarkGravatar Yilun Chong2017-12-05
|\ \ \ \ | |_|/ / |/| | | Sync benchmark changes from internal
| | * | Fixed failing JS testsGravatar Adam Cozzette2017-12-05
| | | |
* | | | Merge pull request #3968 from fahhem/patch-2Gravatar Feng Xiao2017-12-04
|\ \ \ \ | | | | | | | | | | Add a check_version() for use in WORKSPACEs
| * | | | Add a check_protobuf_required_bazel_version() for use in WORKSPACEsGravatar Fahrzin Hemmati2017-12-04
| | | | |
| | * | | Fix bugs to pass testsGravatar Yilun Chong2017-12-04
| | | | |
| | | * | Updated conformance failure listsGravatar Adam Cozzette2017-12-04
| | | | |
* | | | | Remove Xcode directives on some configs.Gravatar Thomas Van Lenten2017-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Sync internal benchmark changesGravatar Yilun Chong2017-12-01
| |/ / / |/| | |
| | * | Updated Makefile.am to add a new file to EXTRA_DISTGravatar Adam Cozzette2017-12-01
| | | |
| | * | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
| | |\ \ | |_|/ / |/| | |
| | * | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| | | |
* | | | Merge pull request #3979 from acozzette/3.5.x-mergeGravatar Adam Cozzette2017-12-01
|\ \ \ \ | |/ / / |/| | | Merge 3.5.x branch into master
| * | | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
|/| | |
| * | | Remove duplicate typedef. (#3975)Gravatar Paul Yang2017-11-30
| | | |
| * | | Provide discardUnknonwnFields API in php (#3976)Gravatar Paul Yang2017-11-30
| | | | | | | | | | | | | | | | | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension.
* | | | Merge pull request #3824 from anuraaga/dev_ragGravatar Feng Xiao2017-11-30
|\ \ \ \ | | | | | | | | | | [Java] Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
* \ \ \ \ Merge pull request #3955 from linux-on-ibm-z/masterGravatar Feng Xiao2017-11-30
|\ \ \ \ \ | | | | | | | | | | | | Adding Release_CompareAndSwap 64-bit variant
* | | | | | Update csharp version number (#3958)Gravatar Jie Luo2017-11-29
| | | | | |
* | | | | | Merge pull request #2519 from ↵Gravatar Joshua Haberman2017-11-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | rubynerd-forks/ruby-fix-repeated-message-type-field unwrap descriptor class before comparison of RepeatedField types
* | | | | | | Fix JsonTokenizer exception messageGravatar Jon Skeet2017-11-29
| | | | | | |
| | | * | | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Gravatar Anuraag Agrawal2017-11-29
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3960 from acozzette/libprotoc-export-fixGravatar Adam Cozzette2017-11-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added back in LIBPROTOC_EXPORT which was removed by mistake
| * | | | | | Added back in LIBPROTOC_EXPORT which was removed by mistakeGravatar Adam Cozzette2017-11-28
|/ / / / / /
* | | | | | Merge pull request #3962 from jleni/fix_dotnetGravatar Adam Cozzette2017-11-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upgrading dotnet to 1.0.4
| * | | | | | Upgrading dotnet to 1.0.4Gravatar Juan Leni2017-11-28
| | | | | | |
* | | | | | | Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404Gravatar Jisi Liu2017-11-27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac script
| | | * | | | Adding Release_CompareAndSwap 64-bit variantGravatar Nayana-ibm2017-11-27
| |_|/ / / / |/| | | | |
| * | | | | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac scriptGravatar Xiaoshuang LU2017-11-23
|/ / / / /
| | * | | Update version for 3.5.0.post1Gravatar Jisi Liu2017-11-22
| | | | |
| | * | | Merge pull request #3941 from google/anandolee-patch-2Gravatar Jisi Liu2017-11-22
| | |\ \ \ | | | | | | | | | | | | Add _file_desc_by_toplevel_extension back
| | | * | | Add _file_desc_by_toplevel_extension backGravatar Jie Luo2017-11-22
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #3919 from jart/less-warningsGravatar Feng Xiao2017-11-21
|\ \ \ \ \ | | | | | | | | | | | | Remove unhelpful build warnings
* \ \ \ \ \ Merge pull request #3918 from OEP/fix-sdistGravatar Feng Xiao2017-11-21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include .cc and .h files in Python source distribution
| | * | | | | Remove unhelpful build warningsGravatar Justine Tunney2017-11-17
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wno-writable-strings removes 230 "ISO C++11 does not allow conversion from string literal to 'char *'" warnings from TensorFlow test / build output. These happen because pyext/ sources pass string literals to Python C API data structures, e.g. PyGetSetDef, which for some reason were designed to not have the const qualifier.
| * | | | | Include .cc and .h files in source distributionGravatar Paul Kilgo2017-11-17
|/ / / / /
* | | | | Small code reorder to maybe make #3893 happy.Gravatar Thomas Van Lenten2017-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | Use the ivar for the -open, so hopefully it lines up with the -close in dealloc and isn't seen as an unbalanced "open".
* | | | | Travis config cleanups and move ObjC to Xcode 9.1.Gravatar Thomas Van Lenten2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop having travis build the test matrix and make it explicit so extra settings are only on the test that need the, this helps make the travis UI a little cleaner (linux hosted stuff doesn't list an Xcode version), as well as avoid unneeded requirements limiting the travis pool something can run on. Small improvements to objectivec/DevTools/full_mac_build.sh to avoid some repeated scripting and hopefully make things more reliable work with Xcode 9.x. Don't mark the iOS tests as able to fail, hopefully with the new settings they are stable and won't give false signals. Simplify the case for xcode versions and fixup xcode 9.[0-1].