aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
| | | |
* | | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \ \ | | | | | | | | | | updated README
| * | | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| | | | |
| * | | | updated READMEbeardedn5rd2016-05-061-1/+4
| | | | |
* | | | | Merge pull request #1496 from ozkuran/masterFeng Xiao2016-05-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Updated README.md
| * | | | Updated README.mdMahmut Ali ÖZKURAN2016-05-061-1/+1
|/ / / / | | | | | | | | Added relative link to cmake guide.
* | | | Merge pull request #1471 from jskeet/any-hostJon Skeet2016-05-066-23/+88
|\ \ \ \ | |_|/ / |/| | | Allow custom type URL prefixes in Any.Pack
| * | | Allow custom type URL prefixes in Any.PackJon Skeet2016-04-296-23/+88
| | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
* | | | Merge pull request #1409 from eeight/fix_enum_corruptionFeng Xiao2016-05-043-2/+50
|\ \ \ \ | | | | | | | | | | Fix bug with silent message corruption in LITE_RUNTIME.
| * | | | Fix bug with silent message corruption in LITE_RUNTIME.Petr Prokhorenkov2016-04-213-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A protobuf message will be corrupted in the following scenario: 1. Use LITE_RUNTIME. 2. Have an optional enum field following some other field. 3. Update protocol by adding new values to the enum. 4. Have an old client parse and serialize a message having enum field set to a value the client does not understand. 5. Field preceeding the enum is now corrupted. The bug is due to the fact that optimized fallthrough in parser code does not update variablle 'tag' when jumping to the parser code for the next field.
* | | | | Merge pull request #1482 from nicolasnoble/rake-tweaks-2Joshua Haberman2016-05-031-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Properly generating well known proto files for the macos build.
| * | | | | Properly generating well known proto files for the macos build.Nicolas "Pixel" Noble2016-05-041-0/+1
|/ / / / /
* | | | | Merge pull request #1464 from google/benchmarksJoshua Haberman2016-05-039-10/+370
|\ \ \ \ \ | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets.
| * | | | | Addressed PR comments.Josh Haberman2016-05-034-55/+9
| | | | | |
| * | | | | Fixed for pre-C++11 ifstream which does not accept std::string.Josh Haberman2016-04-291-2/+2
| | | | | |
| * | | | | Read files directly from filesystem since xxd isn't always available.Josh Haberman2016-04-293-17/+15
| | | | | |
| * | | | | Make the C++ tests build the benchmarking code.Josh Haberman2016-04-291-0/+3
| | | | | |
| * | | | | Updates for PR comments.Josh Haberman2016-04-292-5/+6
| | | | | |
| * | | | | Added README describing the directory.Josh Haberman2016-04-272-3/+33
| | | | | |
| * | | | | Added framework for generating/consuming benchmarking data sets.Josh Haberman2016-04-277-10/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes the code that was sitting in benchmarks/ already and makes it easier for language-specific benchmarks to consume. Future PRs will enhance this so that the language-specific benchmarks can report metrics back that will be tracked over time in PerfKit.
* | | | | | Merge pull request #1473 from nicolasnoble/rake-tweaksJoshua Haberman2016-05-033-31/+43
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation.
| * | | | | Addressing concerns.Nicolas "Pixel" Noble2016-04-301-1/+9
| | | | | |
| * | | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵Nicolas "Pixel" Noble2016-04-293-32/+36
| | | | | | | | | | | | | | | | | | | | | | | | files generation.
* | | | | | Merge pull request #1467 from pherl/masterJisi Liu2016-04-30213-3836/+10987
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge Google internal changes
| * | | | | | Update descritpor protos for objcJisi Liu2016-04-2922-3863/+3
| | | | | | |
| * | | | | | Merge the script fix.Jisi Liu2016-04-291-1/+1
| |\ \ \ \ \ \
| * | | | | | | Update file lists.Jisi Liu2016-04-282-1/+6
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-2825-1234/+3354
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Down integrate from Google internal.Jisi Liu2016-04-28228-3859/+14739
| | | | | | | |
* | | | | | | | Merge pull request #1474 from pherl/fixscriptThomas Van Lenten2016-04-291-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | Fix cp -r usage to be portable.
| * | | | | | Fix cp -r usage to be portable.Jisi Liu2016-04-291-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency.
* | | | | | Merge pull request #1462 from acozzette/ruby-2.3Adam Cozzette2016-04-281-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Added dig and bsearch_index to RepeatedField methods forwarded to array
| * | | | | Added dig and bsearch_index to RepeatedField methods forwarded to arrayAdam Cozzette2016-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the test_acts_likes_an_array test in RepeatedFieldTest, which checks that repeated fields respond to the same methods as regular Ruby arrays. The bsearch_index and dig array methods seem to be new in Ruby 2.3 and so we should support those.
* | | | | | Merge pull request #1461 from thomasvl/fix_bool_handingThomas Van Lenten2016-04-273-5/+114
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix up -hash/-isEqual: for bool storage.
| * | | | | Fix up -hash/-isEqual: for bool storage.Thomas Van Lenten2016-04-273-5/+114
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both methods weren't checking the has_bits (where the bools are stored), so it resulted in invalid results. Add a test that should shake out something like this in the future also.
* | | | | Merge pull request #1455 from haberman/updateupbJoshua Haberman2016-04-274-1222/+1552
|\ \ \ \ \ | |/ / / / |/| | | | Updated upb and simplified ruby code a bit with new upb method.
| * | | | Updated upb and simplified ruby code a bit with new upb method.Josh Haberman2016-04-224-1222/+1552
| | | | |
* | | | | Merge pull request #1454 from thomasvl/enum_defaultsThomas Van Lenten2016-04-263-4/+22
|\ \ \ \ \ | |/ / / / |/| | | | Proper checking of enum with non zero default
| * | | | Proper checking of enum with non zero defaultThomas Van Lenten2016-04-263-4/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proto2 syntax allows the first enum to have a non zero value. This means any field using that default has a non zero default without having an explicit default being set. So when deciding what runtime info is needed, don't rely on an explicit default, always check that the values aren't zero. Fixes https://github.com/google/protobuf/issues/1453
* | | | Merge pull request #1444 from mbrtargeting/masterFeng Xiao2016-04-221-0/+2
|\ \ \ \ | | | | | | | | | | Added serialVersionUID to ExtendableMessage.
| * | | | Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
| | | | |
* | | | | Add initial design document for Swift protocol buffers. (#1442)Tony Allevato2016-04-221-0/+674
|/ / / / | | | | | | | | | | | | * Add initial design doc for Swift protocol buffers.
* | | | Merge pull request #1438 from xfxyjwf/docsFeng Xiao2016-04-211-0/+147
|\ \ \ \ | | | | | | | | | | Add a docs directory and move the third-party add-ons page here.
| * | | | Add a docs directory and move the third-party add-ons page here.Feng Xiao2016-04-201-0/+147
| | | | |
* | | | | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-209-29/+743
|\ \ \ \ \ | |_|/ / / |/| | | | Change protobuf CPP proto generator to support the 'lite' option in
| * | | | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-159-29/+743
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proto3. Added a couple unit test proto3 files, for arena_lite and lite. Cloned the proto3_arena_unittest to test some of the basics of generated code (and to ensure that the generated proto3 test files are used by some test).
* | | | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \ \ \ | | | | | | | | | | Remove googletest.h header from stringprintf.cc
| * | | | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | It doesn't seem to be necessary here, and it pulls other testing headers during compilation of release protobuf.
* | | | | Merge pull request #1434 from jskeet/regenerateThomas Van Lenten2016-04-208-103/+130
|\ \ \ \ \ | | | | | | | | | | | | Regenerate descriptor/well-known types for C#
| * | | | | Regenerate well-known types for C#Jon Skeet2016-04-208-103/+130
|/ / / / / | | | | | | | | | | | | | | | | | | | | (There are documentation changes and new fields in descriptor.proto that have resulted in changes to the serialized descriptor, but no breaking changes for C#.)