| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up | Adam Cozzette | 2016-12-21 | 1 | -1/+2 | |
| | | ||||||
| * | maps_test.js: check whether Symbol is defined before using it (#2524) | Adam Cozzette | 2016-12-21 | 1 | -6/+3 | |
| | | | | | | 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. | |||||
| * | Update _GNUC_VER to use the correct implementation of atomic operation | Bo Yang | 2016-12-21 | 1 | -0/+1 | |
| | | | | | on Mac. | |||||
| * | Explicitly import used class in nano test to avoid random test fail. | Bo Yang | 2016-12-20 | 1 | -1/+4 | |
| | | ||||||
| * | Update conformance test failure list. | Bo Yang | 2016-12-20 | 3 | -1025/+0 | |
| | | ||||||
| * | Down-integrate internal changes to github. | Bo Yang | 2016-12-19 | 112 | -3044/+5638 | |
| |\ | ||||||
| | * | Down-integrate internal changes to github. | Bo Yang | 2016-12-19 | 114 | -3052/+5658 | |
| | | | ||||||
| * | | Merge pull request #2517 from acozzette/js-embed | Adam Cozzette | 2016-12-19 | 6 | -325/+35 | |
| |\ \ | | | | | | | Auto-generate well_known_types_embed.cc | |||||
| | * | | Fixed "make check" for cmake build | Adam Cozzette | 2016-12-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | The check target did not depend on the test_plugin binary, so this would cause "make check" to fail at times because of the absence of test_plugin. This change adds a dependency on test_plugin so that it will always get built before the tests are executed. | |||||
| | * | | Auto-generate well_known_types_embed.cc | Adam Cozzette | 2016-12-19 | 5 | -325/+34 | |
| |/ / | | | | | | | | | | | | | 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.x | Feng Xiao | 2016-12-16 | 4 | -41/+43 | |
| |\ \ | | | | | | | Missed LIBPROTOC_EXPORT for GRPC added | |||||
| | * | | LIBPROTOC_EXPORT added to others functions in csharp_names.h and ↵ | Arkadiy Shapkin | 2016-12-01 | 2 | -33/+33 | |
| | | | | | | | | | | | | | objectivec_helpers.h | |||||
| | * | | Missed LIBPROTOC_EXPORT for GRPC added | Arkadiy Shapkin | 2016-12-01 | 4 | -8/+10 | |
| | | | | ||||||
| * | | | Give C# ByteString a sensible GetHashCode implementation. | Jon Skeet | 2016-12-16 | 2 | -1/+14 | |
| | | | | | | | | | | | | | Fixes #2511. | |||||
| * | | | Merge pull request #2499 from ckennelly/master | Adam Cozzette | 2016-12-15 | 2 | -2/+11 | |
| |\ \ \ | | | | | | | | | Define LANG_CXX11 for port.h and use this to guard C++11 features. | |||||
| | * | | | Define LANG_CXX11 for port.h and use this to guard C++11 features. | Chris Kennelly | 2016-12-14 | 2 | -2/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #2495 from acozzette/android-hash | Adam Cozzette | 2016-12-14 | 2 | -9/+3 | |
| |\ \ \ | | | | | | | | | Removed Android-specific code from stubs/hash.h | |||||
| | * | | | Removed Android-specific code from stubs/hash.h | Adam Cozzette | 2016-12-13 | 2 | -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 #2498 from sergiocampama/enum | Thomas Van Lenten | 2016-12-14 | 1 | -1/+5 | |
| |\ \ \ \ | | | | | | | | | | | Fixes and expands comments on how to use GPB_ENUM_FWD_DECLARE | |||||
| | * | | | | Fixes and expands comments on how to use GPB_ENUM_FWD_DECLARE | Sergio Campama | 2016-12-14 | 1 | -1/+5 | |
| |/ / / / | ||||||
| * | | | | Added conformance testing for binary primitive types. (#2491) | Joshua Haberman | 2016-12-13 | 2 | -37/+162 | |
| | | | | | | | | | | | | | This is basic and more tests will be added over time. | |||||
| * | | | | Merge pull request #2496 from xyzzyz/fix-overflow | Feng Xiao | 2016-12-13 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Fix integer overflow in FastUInt32ToBufferLeft | |||||
| | * | | | | Fix integer overflow in FastUInt32ToBufferLeft | Adam Michalik | 2016-12-13 | 1 | -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-include | Feng Xiao | 2016-12-13 | 3 | -0/+3 | |
| |\ \ \ \ | | | | | | | | | | | Add missing includes | |||||
| | * | | | | Add missing include in embed.cc | Julien Brianceau | 2016-12-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This changes fixes "error C2039: 'getline': is not a member of 'std'" compilation error. | |||||
| | * | | | | Add missing includes | Julien Brianceau | 2016-12-13 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error. | |||||
| * | | | | | Merge pull request #2484 from ngg/uwp_build | Feng Xiao | 2016-12-13 | 16 | -94/+95 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Add support for Windows ARM builds | |||||
| | * | | | | Add support for Windows ARM builds | Gergely Nagy | 2016-12-12 | 16 | -94/+95 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #2487 from jtattermusch/csharp_leading_whitespace | Jan Tattermusch | 2016-12-13 | 19 | -1059/+1059 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | remove leading whitespace in C# xml comments | |||||
| | * | | | | remove leading whitespace in C# xml comments | Jan Tattermusch | 2016-12-12 | 19 | -1059/+1059 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #2471 from jbrianceau/fix-include-style | Feng Xiao | 2016-12-12 | 3 | -3/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix #include in cc files | |||||
| | * | | | | | Fix #include in cc files | Julien Brianceau | 2016-12-09 | 3 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #2490 from xfxyjwf/icon2 | Jisi Liu | 2016-12-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add a badge for bazel build status. | |||||
| | * | | | | | Add a badge for bazel build status. | Feng Xiao | 2016-12-12 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #2454 from pongad/go_package | Feng Xiao | 2016-12-12 | 3 | -8/+10 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | update descriptor.proto's go_package | |||||
| | * | | | | update descriptor.proto's go_package | Michael Darakananda | 2016-12-07 | 3 | -8/+10 | |
| | | |_|/ | |/| | | | | | | | | | | | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto. | |||||
| * | | | | generate_changelog.py: flush output so piping works correctly. | Josh Haberman | 2016-12-09 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #2476 from acozzette/generated-message-reflection-fix | Adam Cozzette | 2016-12-09 | 1 | -4/+4 | |
| |\ \ \ \ | | | | | | | | | | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro | |||||
| | * | | | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro | Adam Cozzette | 2016-12-09 | 1 | -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. | |||||
| * | | | | | Merge pull request #2475 from sergiocampama/rvm2 | Thomas Van Lenten | 2016-12-09 | 2 | -13/+0 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Reenable cocoapods objc test and remove unnecessary workaround for rvm | |||||
| | * | | | | Reenable cocoapods objc test and remove unnecessary workaround for rvm | Sergio Campama | 2016-12-09 | 2 | -13/+0 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #2473 from thomasvl/update_xcodes | Thomas Van Lenten | 2016-12-09 | 3 | -10/+43 | |
| |\ \ \ \ | |_|/ / |/| | | | Update xcode version support and travis usage | |||||
| | * | | | Mark objectivec_cocoapods_integration as failing | Thomas Van Lenten | 2016-12-09 | 1 | -0/+4 | |
| | | | | | ||||||
| | * | | | Skip benchmark test if cmake isn't installed. | Thomas Van Lenten | 2016-12-09 | 1 | -5/+15 | |
| | | | | | ||||||
| | * | | | Xcode 8.1 support | Thomas Van Lenten | 2016-12-09 | 3 | -6/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add entries to objectivec/DevTools/full_mac_build.sh - Support `-quiet` via an option on full_mac_build.sh. NOTE: we don't use this on travis because the lack of output for a long time could cause travis to kill the build (when we get a slow VM). - Update travis config to use newer images. | |||||
| * | | | | Merge pull request #2468 from sergei-ivanov/patch-1 | Feng Xiao | 2016-12-08 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Update third_party.md | |||||
| | * | | | | Update third_party.md | Sergei Ivanov | 2016-12-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Updated the location for `protobuf-maven-plugin` | |||||
| * | | | | | Disable jruby test. (#2469) | Paul Yang | 2016-12-08 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | Missed in #2467. | |||||
| * | | | | Update commit id in Dockerfile to trigger update. (#2467) | Paul Yang | 2016-12-08 | 4 | -9/+16 | |
| | | | | | ||||||
| * | | | | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2 | Feng Xiao | 2016-12-08 | 13 | -91/+94 | |
| |\ \ \ \ | | | | | | | | | | | C++: export _xxx_default_instance_ symbols | |||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |