aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* benchmarks: update readme.txtGravatar Zi Shen Lim2016-08-26
| | | | | | | Remove references to google_speed.proto which was removed in commit 2e83110230b7. Also fix-up commands to build and run.
* Merge pull request #2013 from xfxyjwf/gmockGravatar Feng Xiao2016-08-25
|\ | | | | Update gmock links.
| * Update links in appveyor.ymlGravatar Feng Xiao2016-08-25
| | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
| * Update gmock links.Gravatar Feng Xiao2016-08-25
|/ | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
* Merge pull request #2011 from tomas-abrahamsson/patch-1Gravatar Feng Xiao2016-08-25
|\ | | | | Add an Erlang project, gpb, to third_party.md
| * Add an Erlang project, gpb, to third_party.mdGravatar Tomas Abrahamsson2016-08-25
|/
* Merge pull request #2001 from nicolasnoble/patch-1Gravatar Joshua Haberman2016-08-24
|\ | | | | Fixing regular expression...
| * Fixing regular expression...Gravatar Nicolas Noble2016-08-23
|/ | | This will allow loading the extension for Ruby 2.1.10...
* Merge pull request #1997 from thomasvl/move_include_package_into_helpersGravatar Thomas Van Lenten2016-08-23
|\ | | | | Move ImportWriter into helpers for sharing
| * Remove the compiler options from ImportWriter.Gravatar Thomas Van Lenten2016-08-23
| | | | | | | | | | | | | | | | Breaks the tie of the ImportWriter to the ObjC generation, allow grpc to use a different extension and to relay the values they need for these. - Pass in the two framework options to the ctor. - Pass in the header extension to AddFile.
| * Move the ImportWriter into the ObjC Helpers.Gravatar Thomas Van Lenten2016-08-23
|/ | | | | grpc likely needs to provide the same sorta handling, so expose the class so the logic can be reused.
* Add note about JSON tests maybe being wrong. (#1992)Gravatar Thomas Van Lenten2016-08-23
| | | | | | | | Add note about JSON tests maybe being wrong. - Add note about the JSON test maybe not being correct yet. - Add test to checks the generated names for double underscores to be sure they are what is expected.
* Merge pull request #1984 from thomasvl/more_json_testsGravatar Thomas Van Lenten2016-08-22
|\ | | | | More tests to shake out some cases in the json parsing
| * More JSON testsGravatar Thomas Van Lenten2016-08-22
|/ | | | | - String behaviors - Testing only valid JSON is allowed
* Adds better support for protos without packages (#1979)Gravatar Sergio Campamá2016-08-19
| | | | Adds better support for protos without packages and more warnings on possible improvements
* Merge pull request #1967 from sergiocampama/castGravatar Thomas Van Lenten2016-08-16
|\ | | | | Fixes #1844
| * Adding casts so that code importing protobug using -Wconversion does not ↵Gravatar Sergio Campama2016-08-16
|/ | | | generate warnings.
* Add more JSON tests around underscores (#1963)Gravatar Thomas Van Lenten2016-08-16
| | | | Add more JSON tests around underscores
* Merge pull request #1957 from xfxyjwf/jenkins_badgeGravatar Feng Xiao2016-08-15
|\ | | | | Add a jenkins test status badge.
* \ Merge pull request #1964 from thomasvl/missing_ignoresGravatar Thomas Van Lenten2016-08-15
|\ \ | | | | | | Fix up ignores and conformance generation
| * | Fix up ignores and conformance generationGravatar Thomas Van Lenten2016-08-15
|/ / | | | | | | | | | | - Update ruby conformance generation for rename of generated files that seems to have happened. - Update gitignores for the above and for the no-warnings-test.
* | Merge pull request #1960 from jskeet/oneofGravatar Thomas Van Lenten2016-08-15
|\ \ | | | | | | Regenerate conformance files to include extra oneof fields.
| * | Regenerate conformance files to include extra oneof fields.Gravatar Jon Skeet2016-08-15
|/ / | | | | | | | | | | This should fix the failures in the conformance tests - although it highlights the problem that we need to do this when changing the conformance.proto file...
| * Add a jenkins test status badge.Gravatar Feng Xiao2016-08-12
|/ | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
* Fixes extra whitespace on generated comments. (#1950)Gravatar Sergio Campamá2016-08-12
| | | | Fixes extra whitespace on generated comments.
* Merge pull request #1949 from thomasvl/objc_more_reset_testsGravatar Thomas Van Lenten2016-08-12
|\ | | | | Objc more reset tests
| * More complete nil/reset tests within a oneofGravatar Thomas Van Lenten2016-08-12
| |
| * Fix some constants to be correct for the message class in use.Gravatar Thomas Van Lenten2016-08-12
| |
| * More explicit tests for nil behaviors on fields.Gravatar Thomas Van Lenten2016-08-12
|/ | | | | Code already works, but make a bank of tests that call it out so things are very clean in the future just to be safe.
* Merge pull request #1942 from thomasvl/objc_fix_oneof_zerosGravatar Thomas Van Lenten2016-08-11
|\ | | | | Objc fix oneof zeros and more oneof zero conformance tests
| * Add more types to the zero oneof cases.Gravatar Thomas Van Lenten2016-08-11
| | | | | | | | | | | | Incase the different runtimes have different generation/implementations for for the different primitive field types, cover a larger range of the proto types in the oneof zero tests.
| * Record zero for "has" for proto3 if in a oneof.Gravatar Thomas Van Lenten2016-08-11
|/ | | | | | | 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.
* Add conformance test for zero fields in oneofs. (#1939)Gravatar Thomas Van Lenten2016-08-11
| | | | * Add conformance test for zero fields in oneofs. * Add failures to the "expected" files.
* Merge pull request #1934 from thomasvl/objc_strings_with_nullGravatar Thomas Van Lenten2016-08-09
|\ | | | | Never use strlen on utf8 runs so null characters work.
| * Never use strlen on utf8 runs so null characters work.Gravatar Thomas Van Lenten2016-08-09
|/ | | | | | | | | | | | | | 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.
* Adds support for appledoc in generated code. (#1928)Gravatar Sergio Campamá2016-08-09
| | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866
* Merge pull request #1842 from udnaan/masterGravatar Feng Xiao2016-08-08
|\ | | | | fixed cmake config files install path
* | Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867)Gravatar Sergio Campamá2016-08-08
| | | | | | | | | | | | | | | | Work for #1866 Migrates all the public class docs over to appledoc format. While Xcode is fine with blank lines in `///` comments, appledoc (used by cocoadocs) isn't and was leaving a bunch of info off the doc pages. The generator still needs to be updated to do this also; that will be a follow up CL.
* | Merge pull request #1923 from bryongloden/patch-1Gravatar Feng Xiao2016-08-05
|\ \ | | | | | | close opened file descriptors properly
| * | close opened file descriptors properlyGravatar Bryon Gloden, CISSP®2016-08-05
| | |
* | | Merge pull request #1924 from PiotrSikora/export_licenseGravatar Jisi Liu2016-08-05
|\ \ \ | | | | | | | | Bazel: export LICENSE file.
* \ \ \ Merge pull request #1926 from hotpxl/masterGravatar Feng Xiao2016-08-05
|\ \ \ \ | |_|/ / |/| | | [master] Add dependency cl. Fixes google/protobuf#295.
| * | | [master] Add dependency cl. Fixes google/protobuf#295.Gravatar Yutian Li2016-08-05
|/ / /
| * / Bazel: export LICENSE file.Gravatar Piotr Sikora2016-08-04
|/ / | | | | | | Signed-off-by: Piotr Sikora <piotrsikora@google.com>
* | Merge pull request #1044 from mark-whiting/masterGravatar Feng Xiao2016-08-04
|\ \ | | | | | | Adding missing generic gcc 64-bit atomicops.
* \ \ Merge pull request #1898 from sergiocampama/watchosGravatar Thomas Van Lenten2016-08-04
|\ \ \ | | | | | | | | Adds watch os deployment target for protobuf
* \ \ \ Merge pull request #1865 from podsvirov/topic-cmake-projectGravatar Feng Xiao2016-08-03
|\ \ \ \ | | | | | | | | | | CMake: Improvements and Bugfixes
* \ \ \ \ Merge pull request #1914 from adamatan/typo-fixGravatar Feng Xiao2016-08-03
|\ \ \ \ \ | | | | | | | | | | | | Typo: beffer -> buffer
| * | | | | Typo: beffer -> bufferGravatar Adam Matan2016-08-03
|/ / / / /
| * | | | CMake: Auto find ZLIB from package config if neddedGravatar Konstantin Podsvirov2016-08-02
| | | | |