Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix #1955 clang-tidy warning misc-macro-parentheses | Chih-Hung Hsieh | 2016-09-02 | 6 | -14/+14 |
| | | | | | clang-tidy gives warning "macro argument should be enclosed in parentheses" to macro ZR_, the "first" parameter. | ||||
* | Merge pull request #2045 from mike07026/master | Feng Xiao | 2016-09-02 | 2 | -1/+32 |
|\ | | | | | fix #1342 cause by ownership issues | ||||
| * | detect invaild JSON encoding in bytes field | mike07026 | 2016-09-01 | 1 | -23/+23 |
| | | |||||
| * | detect invaild JSON encoding in bytes field | mike07026 | 2016-09-01 | 1 | -0/+28 |
| | | |||||
| * | fix #1342 cause by ownership issues | mike07026 | 2016-09-01 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #2053 from thomasvl/improve_root_registry_wiring | Thomas Van Lenten | 2016-09-02 | 26 | -86/+626 |
|\ \ | | | | | | | Make Root's +extensionRegistry generation smarter. | ||||
| * | | Make Root's +extensionRegistry generation smarter. | Thomas Van Lenten | 2016-09-01 | 26 | -86/+626 |
| | | | | | | | | | | | | | | | | | | | | | At generation time, walk the file's dependencies to see what really contains extensions so we can generate more minimal code that only links together the roots that provided extensions. Gets a bunch of otherwise noop code out of the call flow when the roots are +initialized. | ||||
* | | | Merge pull request #2039 from khingblue/remove-unused-vector | Jisi Liu | 2016-09-01 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | Remove unused vector | ||||
| * | | Remove unused vector | Khing | 2016-08-31 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #2024 from pstavirs/master | Feng Xiao | 2016-08-31 | 7 | -12/+8 |
|\ \ \ | |_|/ |/| | | Restore New*Callback into google::protobuf namespace … | ||||
| * | | Restore New*Callback into google::protobuf namespace since these are used by ↵ | Srivats P | 2016-08-29 | 7 | -12/+8 |
| |/ | | | | | | | | | | | the service stubs code Fixes #1966 | ||||
* | | Merge pull request #2033 from frett/osgiExport | Feng Xiao | 2016-08-30 | 1 | -2/+2 |
|\ \ | | | | | | | update the OSGi metadata for the javanano package | ||||
| * | | update the OSGi SymbolicName and ExportedPackage for the javanano library | Daniel Frett | 2016-08-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2031 from thomasvl/dont_require_filegenerators | Thomas Van Lenten | 2016-08-30 | 2 | -54/+14 |
|\ \ \ | |/ / |/| | | Speed up ObjC Generation with large dependency trees | ||||
| * | | Speed up ObjC Generation with large dependency trees | Thomas Van Lenten | 2016-08-30 | 2 | -54/+14 |
|/ / | | | | | | | | | | | | | | | | | Don't create FileGenerators for each dep. FileGenerators will deeply create all the message, enum, and field generators; but those aren't needed when doing the imports for dependencies. Instead directly generate the imports off the FileDescriptors so no extra objects are created. The only other use was when chaining together the *Roots for the file extension registry, but that also can be generate off the name of the FileDescriptor directly. | ||||
* | | Merge pull request #2012 from haberman/rubymapgcfix | Joshua Haberman | 2016-08-29 | 4 | -9/+59 |
|\ \ | | | | | | | Ruby: make sure map parsing frames are GC-rooted. | ||||
| * | | upb bugfix: JSON map entry keys were passing the wrong closure. | Josh Haberman | 2016-08-29 | 1 | -1/+1 |
| | | | |||||
| * | | Ruby: make sure map parsing frames are GC-rooted. | Josh Haberman | 2016-08-26 | 3 | -8/+58 |
| |/ | |||||
* | | Merge pull request #1920 from gegles/master | Joshua Haberman | 2016-08-29 | 1 | -0/+2 |
|\ \ | | | | | | | Fix missing import of jspb.Map (#1885) | ||||
| * | | Fix missing import of jspb.Map (#1885) | Guillaume Egles | 2016-08-03 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #2018 from thomasvl/support_generate_all | Thomas Van Lenten | 2016-08-29 | 5 | -58/+98 |
|\ \ \ | |_|/ |/| | | ObjC support for GenerateAll(). | ||||
| * | | Support GenerateAll(). | Thomas Van Lenten | 2016-08-26 | 5 | -58/+98 |
| | | | | | | | | | | | | | | | - Expect calls on GenerateAll() and not Generate(). - Parse the prefix validation file once, and then check all the files. | ||||
* | | | Merge pull request #2013 from xfxyjwf/gmock | Feng Xiao | 2016-08-25 | 2 | -7/+18 |
|\ \ \ | | | | | | | | | Update gmock links. | ||||
| * | | | Update links in appveyor.yml | Feng Xiao | 2016-08-25 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1 | ||||
| * | | | Update gmock links. | Feng Xiao | 2016-08-25 | 1 | -4/+9 |
|/ / / | | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07 | ||||
* | | | Merge pull request #2011 from tomas-abrahamsson/patch-1 | Feng Xiao | 2016-08-25 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Add an Erlang project, gpb, to third_party.md | ||||
| * | | Add an Erlang project, gpb, to third_party.md | Tomas Abrahamsson | 2016-08-25 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2001 from nicolasnoble/patch-1 | Joshua Haberman | 2016-08-24 | 1 | -1/+1 |
|\ \ | | | | | | | Fixing regular expression... | ||||
| * | | Fixing regular expression... | Nicolas Noble | 2016-08-23 | 1 | -1/+1 |
|/ / | | | | | This will allow loading the extension for Ruby 2.1.10... | ||||
* | | Merge pull request #1997 from thomasvl/move_include_package_into_helpers | Thomas Van Lenten | 2016-08-23 | 4 | -207/+224 |
|\ \ | | | | | | | Move ImportWriter into helpers for sharing | ||||
| * | | Remove the compiler options from ImportWriter. | Thomas Van Lenten | 2016-08-23 | 3 | -22/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | Thomas Van Lenten | 2016-08-23 | 4 | -205/+202 |
|/ / | | | | | | | | | 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) | Thomas Van Lenten | 2016-08-23 | 8 | -16/+35 |
| | | | | | | | | | | | | | | | | 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_tests | Thomas Van Lenten | 2016-08-22 | 4 | -0/+85 |
|\ \ | | | | | | | More tests to shake out some cases in the json parsing | ||||
| * | | More JSON tests | Thomas Van Lenten | 2016-08-22 | 4 | -0/+85 |
|/ / | | | | | | | | | - String behaviors - Testing only valid JSON is allowed | ||||
* | | Adds better support for protos without packages (#1979) | Sergio Campamá | 2016-08-19 | 1 | -17/+51 |
| | | | | | | | | Adds better support for protos without packages and more warnings on possible improvements | ||||
* | | Merge pull request #1967 from sergiocampama/cast | Thomas Van Lenten | 2016-08-16 | 1 | -4/+4 |
|\ \ | | | | | | | Fixes #1844 | ||||
| * | | Adding casts so that code importing protobug using -Wconversion does not ↵ | Sergio Campama | 2016-08-16 | 1 | -4/+4 |
|/ / | | | | | | | generate warnings. | ||||
* | | Add more JSON tests around underscores (#1963) | Thomas Van Lenten | 2016-08-16 | 5 | -39/+259 |
| | | | | | | | | Add more JSON tests around underscores | ||||
* | | Merge pull request #1957 from xfxyjwf/jenkins_badge | Feng Xiao | 2016-08-15 | 1 | -1/+1 |
|\ \ | | | | | | | Add a jenkins test status badge. | ||||
| * | | Add a jenkins test status badge. | Feng Xiao | 2016-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce | ||||
* | | | Merge pull request #1964 from thomasvl/missing_ignores | Thomas Van Lenten | 2016-08-15 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | Fix up ignores and conformance generation | ||||
| * | | | Fix up ignores and conformance generation | Thomas Van Lenten | 2016-08-15 | 2 | -2/+4 |
|/ / / | | | | | | | | | | | | | | | | - 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/oneof | Thomas Van Lenten | 2016-08-15 | 2 | -103/+242 |
|\ \ \ | |/ / |/| | | Regenerate conformance files to include extra oneof fields. | ||||
| * | | Regenerate conformance files to include extra oneof fields. | Jon Skeet | 2016-08-15 | 2 | -103/+242 |
|/ / | | | | | | | | | | | 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... | ||||
* | | Fixes extra whitespace on generated comments. (#1950) | Sergio Campamá | 2016-08-12 | 10 | -123/+131 |
| | | | | | | | | Fixes extra whitespace on generated comments. | ||||
* | | Merge pull request #1949 from thomasvl/objc_more_reset_tests | Thomas Van Lenten | 2016-08-12 | 1 | -29/+152 |
|\ \ | | | | | | | Objc more reset tests | ||||
| * | | More complete nil/reset tests within a oneof | Thomas Van Lenten | 2016-08-12 | 1 | -6/+12 |
| | | | |||||
| * | | Fix some constants to be correct for the message class in use. | Thomas Van Lenten | 2016-08-12 | 1 | -21/+23 |
| | | | |||||
| * | | More explicit tests for nil behaviors on fields. | Thomas Van Lenten | 2016-08-12 | 1 | -4/+119 |
|/ / | | | | | | | | | 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. |