Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
| | |||||
* | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1 | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
|\ | | | | | Declare an init and avoid passing NULL to initWithValue:count: | ||||
| * | Declare an init and avoid passing NULL to initWithValue:count: | Thomas Van Lenten | 2016-05-10 | 2 | -65/+90 |
| | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189 | ||||
* | | Merge pull request #1498 from thomasvl/build_cleanup | Joshua Haberman | 2016-05-09 | 3 | -3/+110 |
|\ \ | |/ |/| | Build cleanup | ||||
| * | Add the missing maintiner-clean entry for benchmarks | Thomas Van Lenten | 2016-05-06 | 1 | -0/+3 |
| | | |||||
| * | Properly express all outputs for the conformance build | Thomas Van Lenten | 2016-05-06 | 1 | -3/+105 |
| | | | | | | | | | | - Fixes up `make distclean` and `make maintainer-clean` - Fixes the build so make is more likely to notice if one of those files is stale/missing. | ||||
| * | Add two missing ignores for conformance directory. | Thomas Van Lenten | 2016-05-06 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #1502 from pherl/master | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
|\ \ | | | | | | | Remove accidentally restored deleted files. | ||||
| * | | Remove accidentally restored deleted files. | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
| | | | |||||
* | | | Merge pull request #1494 from pherl/master | Jisi Liu | 2016-05-06 | 5 | -6/+6 |
|\| | | | | | | | | Fix the std::string error introduced in integration. | ||||
| * | | Fix using std::shared_ptr | Jisi Liu | 2016-05-05 | 5 | -5/+5 |
| | | | |||||
| * | | Fix the std::string error introduced in integration. | Jisi Liu | 2016-05-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1499 from beardedN5rd/master | Feng Xiao | 2016-05-06 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | updated README | ||||
| * | | | after comment of Feng Xiao changed the entry to g++ | beardedn5rd | 2016-05-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | updated README | beardedn5rd | 2016-05-06 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #1496 from ozkuran/master | Feng Xiao | 2016-05-06 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Updated README.md | ||||
| * | | | Updated README.md | Mahmut Ali ÖZKURAN | 2016-05-06 | 1 | -1/+1 |
|/ / / | | | | | | | Added relative link to cmake guide. | ||||
* | | | Merge pull request #1471 from jskeet/any-host | Jon Skeet | 2016-05-06 | 6 | -23/+88 |
|\ \ \ | |_|/ |/| | | Allow custom type URL prefixes in Any.Pack | ||||
| * | | Allow custom type URL prefixes in Any.Pack | Jon Skeet | 2016-04-29 | 6 | -23/+88 |
| | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459. | ||||
* | | | Merge pull request #1409 from eeight/fix_enum_corruption | Feng Xiao | 2016-05-04 | 3 | -2/+50 |
|\ \ \ | | | | | | | | | Fix bug with silent message corruption in LITE_RUNTIME. | ||||
| * | | | Fix bug with silent message corruption in LITE_RUNTIME. | Petr Prokhorenkov | 2016-04-21 | 3 | -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-2 | Joshua Haberman | 2016-05-03 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Properly generating well known proto files for the macos build. | ||||
| * | | | | Properly generating well known proto files for the macos build. | Nicolas "Pixel" Noble | 2016-05-04 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1464 from google/benchmarks | Joshua Haberman | 2016-05-03 | 9 | -10/+370 |
|\ \ \ \ | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets. | ||||
| * | | | | Addressed PR comments. | Josh Haberman | 2016-05-03 | 4 | -55/+9 |
| | | | | | |||||
| * | | | | Fixed for pre-C++11 ifstream which does not accept std::string. | Josh Haberman | 2016-04-29 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Read files directly from filesystem since xxd isn't always available. | Josh Haberman | 2016-04-29 | 3 | -17/+15 |
| | | | | | |||||
| * | | | | Make the C++ tests build the benchmarking code. | Josh Haberman | 2016-04-29 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Updates for PR comments. | Josh Haberman | 2016-04-29 | 2 | -5/+6 |
| | | | | | |||||
| * | | | | Added README describing the directory. | Josh Haberman | 2016-04-27 | 2 | -3/+33 |
| | | | | | |||||
| * | | | | Added framework for generating/consuming benchmarking data sets. | Josh Haberman | 2016-04-27 | 7 | -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-tweaks | Joshua Haberman | 2016-05-03 | 3 | -31/+43 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation. | ||||
| * | | | | Addressing concerns. | Nicolas "Pixel" Noble | 2016-04-30 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵ | Nicolas "Pixel" Noble | 2016-04-29 | 3 | -32/+36 |
| | | | | | | | | | | | | | | | | | | | | files generation. | ||||
* | | | | | Merge pull request #1467 from pherl/master | Jisi Liu | 2016-04-30 | 213 | -3836/+10987 |
|\ \ \ \ \ | | | | | | | | | | | | | Merge Google internal changes | ||||
| * | | | | | Update descritpor protos for objc | Jisi Liu | 2016-04-29 | 22 | -3863/+3 |
| | | | | | | |||||
| * | | | | | Merge the script fix. | Jisi Liu | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update file lists. | Jisi Liu | 2016-04-28 | 2 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 25 | -1234/+3354 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 228 | -3859/+14739 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1474 from pherl/fixscript | Thomas Van Lenten | 2016-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | Fix cp -r usage to be portable. | ||||
| * | | | | | Fix cp -r usage to be portable. | Jisi Liu | 2016-04-29 | 1 | -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.3 | Adam Cozzette | 2016-04-28 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Added dig and bsearch_index to RepeatedField methods forwarded to array | ||||
| * | | | | Added dig and bsearch_index to RepeatedField methods forwarded to array | Adam Cozzette | 2016-04-27 | 1 | -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_handing | Thomas Van Lenten | 2016-04-27 | 3 | -5/+114 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix up -hash/-isEqual: for bool storage. | ||||
| * | | | | Fix up -hash/-isEqual: for bool storage. | Thomas Van Lenten | 2016-04-27 | 3 | -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/updateupb | Joshua Haberman | 2016-04-27 | 4 | -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 Haberman | 2016-04-22 | 4 | -1222/+1552 |
| | | | | |||||
* | | | | Merge pull request #1454 from thomasvl/enum_defaults | Thomas Van Lenten | 2016-04-26 | 3 | -4/+22 |
|\ \ \ \ | |/ / / |/| | | | Proper checking of enum with non zero default | ||||
| * | | | Proper checking of enum with non zero default | Thomas Van Lenten | 2016-04-26 | 3 | -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 |