aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update files to include php generators (#2165)Jisi Liu2016-09-223-1/+7
|
* Update version number.Feng Xiao2016-09-2213-13/+13
| | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
* Fix java compatibilty tests.Feng Xiao2016-09-221-350/+1
| | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
* Fix bugs for internal integration.Bo Yang2016-09-221-3/+3
|
* Fix hash computation for JRuby's RubyMessageBrendan Ribera2016-09-221-2/+17
| | | | | | | | | | `System.identityHashCode` returns a hash that does not consider a Message's values. This means two Messages with identical values will not have identical hashCodes. This patch uses the pattern from RubyMap to combine the hashCodes from all values in a given message and produce a unique, consistent, value-based hash.
* Fix travis, jenkins environment issues.Bo Yang2016-09-213-3/+3
|
* Added new has_bits.h file to cmake/extract_includes.bat.in (#2152)Adam Cozzette2016-09-211-0/+1
| | | | This is necessary so that the CMake build knows to include this header file in the installation include/ directory.
* Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) ↵Adam Cozzette2016-09-211-7/+3
| | | | | | | | | (#2146) Currently deserialization of a non-packed binary repeated field is quadratic in the number of elements, because each time we parse a new element we copy over all elements we have parsed so far. This CL fixes the performance problem by having the generated deserialization code just call addX() instead of using getX() and setX().
* Fix bugs for csharp and ruby for internal integration.Bo Yang2016-09-212-217/+215
|
* Fix python bugs for internal integration.Bo Yang2016-09-213-5/+13
|
* Bump library veriosn to 3.1Bo Yang2016-09-2125-166/+127
|
* Fix bugs for internal integration.Bo Yang2016-09-209-1586/+11
|
* Fix gson dependency.Bo Yang2016-09-202-2/+2
| | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-09-2015-15/+15
|
* Fix for maps_test.js in JavaScript. (#2145)Joshua Haberman2016-09-202-63/+31
| | | | | Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out.
* Fix bugs for internal integration.Bo Yang2016-09-194-41/+49
|
* Use a custom dictionary to avoid NSNumber operations.Thomas Van Lenten2016-09-191-16/+31
| | | | | For the secondary dictionary, use a custom CFDictionary with integer keys to avoid the NSNumber conversions.
* Remove the custom key functions and just use the system provided defaults.Thomas Van Lenten2016-09-191-40/+3
|
* Integrate internal changesBo Yang2016-09-19280-8143/+19655
|
* Merge pull request #2037 from abscondment/fix-2036-ruby-hashJoshua Haberman2016-09-182-8/+9
|\ | | | | Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
| * fix #2036: use `rb_hash_*` to accumulate hashesBrendan Ribera2016-08-301-7/+5
| | | | | | | | | | | | | | Instead of shifting/xoring the hash at each field, use the built-in ruby apis for generating a hash from multiple input values. Now returns a Fixnum.
| * failing test for #2036:Brendan Ribera2016-08-301-1/+4
| | | | | | | | | | * add a repeated field to the tested hash * also assert that two messages with identical values produce identical hashes
* | Merge pull request #2130 from kilink/substring-comment-fixFeng Xiao2016-09-161-3/+3
|\ \ | | | | | | Fix erroneous comment regarding String.substring
| * | Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
|/ / | | | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* | Some php engine implementation doesn't have return_value_ptr properly set. ↵Bo Yang2016-09-151-1/+1
| | | | | | | | Explicitly use &return_value.
* | Auto-generate proto files for tests.Bo Yang2016-09-154-1424/+14
| |
* | Add back missing test proto files.Bo Yang2016-09-151-0/+7
| |
* | Merge pull request #2112 from pherl/mergeJisi Liu2016-09-1541-20/+185
|\ \ | | | | | | Merge 3.0.x into master
| * \ Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-1441-20/+185
| |\ \
| | * \ Merge pull request #2096 from pherl/3.0.xJisi Liu2016-09-081-25/+33
| | |\ \ | | | | | | | | | | Cherry pick objc test changes into 3.0.x branch
| | | * | More complete nil/reset tests within a oneofThomas Van Lenten2016-09-081-6/+12
| | | | |
| | | * | Fix some constants to be correct for the message class in use.Thomas Van Lenten2016-09-081-21/+23
| | |/ /
| | * | Merge pull request #2087 from khingblue/fix-unused-paramJisi Liu2016-09-0813-0/+55
| | |\ \ | | | | | | | | | | Fix #2032 unused parameter 'deterministic'
| | | * | Fix #2032 unused parameter 'deterministic'Khing2016-09-0813-0/+55
| | |/ / | | | | | | | | | | | | | | | | | | | | Parameter deterministic is unused in InternalSerializeWithCachedSizesToArray(), which generates unused parameter warning in every message.
| | * | Merge pull request #2083 from pherl/3.0.xJisi Liu2016-09-071-1/+1
| | |\ \ | | | | | | | | | | Merge pull request #1884 from hochhaus/valueWriterFn
| | | * | Merge pull request #1884 from hochhaus/valueWriterFnJoshua Haberman2016-09-071-1/+1
| | |/ / | | | | | | | | Fix valueWriterFn_ variable name
| | * | Merge pull request #2077 from pherl/3.0.xv3.0.2Jisi Liu2016-09-061-1/+1
| | |\ \ | | | | | | | | | | Update release date in the change log
| | | * | Update release date in the change logJisi Liu2016-09-061-1/+1
| | |/ /
| | * | Merge pull request #2062 from pherl/3.0.2Jisi Liu2016-09-0611-11/+11
| | |\ \ | | | | | | | | | | Bump version number to 3.0.2
| | | * | Bump version number to 3.0.2Jisi Liu2016-09-0211-11/+11
| | | | |
| | * | | Merge pull request #2061 from pherl/changelogJisi Liu2016-09-061-0/+20
| | |\ \ \ | | | |/ / | | |/| | Changelog update for 3.0.2
| | | * | ruby, js and c# changesJisi Liu2016-09-021-2/+6
| | | | |
| | | * | objc change logJisi Liu2016-09-021-0/+16
| | | | |
| | * | | Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-025-16/+18
| | |\ \ \ | | | |/ / | | |/| | Cherry pick c# changes from master
| | | * | Bring C#'s ToPascalCase method in line with C++.Jon Skeet2016-07-272-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | (This still doesn't fix the conformance tests, but at least we're now consistent with the C++ code.)
| | | * | Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| | | | |
| | * | | Merge pull request #1978 from pherl/cpJisi Liu2016-09-021-1/+1
| | |\ \ \ | | | | | | | | | | | | Cherry-pick into 3.0.0-GA branch: Add a jenkins test status badge.
| | | * | | Add a jenkins test status badge.Feng Xiao2016-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
| | * | | | Merge pull request #2026 from pherl/cpjsJisi Liu2016-09-026-14/+66
| | |\ \ \ \ | | | | | | | | | | | | | | Fix missing import of jspb.Map (#1885)
| | | * | | | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81