aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added convenient script for generating changelog draft.Josh Haberman2016-09-211-0/+65
|
* Merge pull request #2149 from khingblue/remove-obsoleted-projectFeng Xiao2016-09-211-1/+0
|\ | | | | Remove obsoleted project of j2me
| * Remove obsoleted project of j2meKhing2016-09-211-1/+0
|/
* Merge pull request #2144 from abscondment/fix-jruby-hashJoshua Haberman2016-09-201-2/+17
|\ | | | | Fix hash computation for JRuby's RubyMessage
| * Fix hash computation for JRuby's RubyMessageBrendan Ribera2016-09-201-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.
* Merge pull request #2137 from thomasvl/objc_extensions_tweakThomas Van Lenten2016-09-192-56/+34
|\ | | | | Objc extensions tweaks
| * 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
|/
* 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
| | | * | | | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-304-9/+59
| | | | | | | | | | | | | | | | | | | | | Ruby: make sure map parsing frames are GC-rooted.
| | | * | | | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-291-0/+2
| | |/ / / /
| | * | | | Merge pull request #2014 from pherl/fixgmockJisi Liu2016-08-262-7/+18
| | |\ \ \ \ | | | |/ / / | | |/| | | Change autogen.sh to download the zip from github
| | | * | | Update gmock links.Feng Xiao2016-08-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
| | | * | | Update links in appveyor.ymlFeng Xiao2016-08-261-3/+9
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
| | * | | Merge pull request #1977 from thomasvl/bump_cocoapod_specThomas Van Lenten2016-08-181-1/+2
| | |\ \ \ | | | | | | | | | | | | Bump the version in prep for the 3.0.2 tag being cut
| | | * | | Bump the version in prep for the 3.0.2 tag being cutThomas Van Lenten2016-08-171-1/+2
| | |/ / / | | | | | | | | | | | | | | | Also pull the watchos support info from master.
| | * | | Merge pull request #1975 from pherl/cpThomas Van Lenten2016-08-1739-1687/+10969
| | |\ \ \ | | | | | | | | | | | | Cherry pick objc changes into 3.0.0-GA branch
| | | * | | Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-173-29/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a message is proto3, then the zero values still count as being set one the field is in a oneof. Add tests to confirm oneofs work as expected in both syntaxes.
| | | * | | Never use strlen on utf8 runs so null characters work.Thomas Van Lenten2016-08-173-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1933 Add a new test that forces strings into two different implementations from the NSString class cluster to help confirm we're exercising both paths by which CodedOutputStream will extract data from an NSString. Move the old +load test (that was flawed because the behavior really depends on the type of string from the NSString class cluster); into a unittest that targets the specific case we're adding a behavior confirmation on. As a bonus, improve the TextFormat generation of string characters < 0x20.
| | | * | | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-1710-123/+131
| | | | | | | | | | | | | | | | | | | | | | | | Fixes extra whitespace on generated comments.