aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2094 from thomasvl/update_wkt_commentsThomas Van Lenten2016-09-081-3/+13
|\ | | | | Fix error and add note about lossy issues
| * Fix error and add note about lossy issuesThomas Van Lenten2016-09-081-3/+13
| |
* | Support the -Wassign-enum compiler flag. (#2085)Sergio Campamá2016-09-0821-56/+102
|/ | | | Support the -Wassign-enum compiler flag.
* Merge pull request #2079 from khingblue/fix-generate-descriptorFeng Xiao2016-09-071-1/+1
|\ | | | | Fix #2071 replacing /bin/sh with bash when generates descriptor
| * Fix #2071 replacing /bin/sh with bashKhing2016-09-071-1/+1
|/ | | | | On Ubuntu /bin/sh is dash by default, this can cause generate_descriptor_proto.sh fail to execute.
* Merge pull request #2047 from jonathon-love/masterJoshua Haberman2016-09-061-1/+1
|\ | | | | Fix to typo/oversight in reflection tests
| * Fix to typo/oversight in python testsJonathon Love2016-09-021-1/+1
| | | | | | | | Fix to typo/oversight in python tests, only affecting python 3
* | Rm check on dependency in the C# reflection API (#2051)Guillaume Turri2016-09-051-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This check adds a few constraints on the way to build a project when we have a proto file which imports another one. In particular, on projects which build both C# and Java, it's easy to end up with exceptions like Expected: included.proto but was src/main/protobuf/included.proto A user may work around this issue, but it may add unnecessary constraints on the layout of the project. According to https://github.com/google/protobuf/commit/f3504cf3b1d456a843e8242fdee9ba0bf2991dc1#diff-ecb0b909ed572381a1c8d1994f09a948R309 it has already been considered to get rid of this check, for similar considerations, and because it doesn't exist in the Java code
* | Merge pull request #2059 from chih-hung/masterFeng Xiao2016-09-026-14/+14
|\ \ | | | | | | Fix #1955 clang-tidy warning misc-macro-parentheses
| * | Fix #1955 clang-tidy warning misc-macro-parenthesesChih-Hung Hsieh2016-09-026-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/masterFeng Xiao2016-09-022-1/+32
|\ \ | | | | | | fix #1342 cause by ownership issues
| * | detect invaild JSON encoding in bytes fieldmike070262016-09-011-23/+23
| | |
| * | detect invaild JSON encoding in bytes fieldmike070262016-09-011-0/+28
| | |
| * | fix #1342 cause by ownership issuesmike070262016-09-011-1/+4
| | |
* | | Merge pull request #2053 from thomasvl/improve_root_registry_wiringThomas Van Lenten2016-09-0226-86/+626
|\ \ \ | |_|/ |/| | Make Root's +extensionRegistry generation smarter.
| * | Make Root's +extensionRegistry generation smarter.Thomas Van Lenten2016-09-0126-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-vectorJisi Liu2016-09-011-1/+0
|\ \ \ | |_|/ |/| | Remove unused vector
| * | Remove unused vectorKhing2016-08-311-1/+0
| | |
* | | Merge pull request #2024 from pstavirs/masterFeng Xiao2016-08-317-12/+8
|\ \ \ | |_|/ |/| | Restore New*Callback into google::protobuf namespace …
| * | Restore New*Callback into google::protobuf namespace since these are used by ↵Srivats P2016-08-297-12/+8
| |/ | | | | | | | | | | the service stubs code Fixes #1966
* | Merge pull request #2033 from frett/osgiExportFeng Xiao2016-08-301-2/+2
|\ \ | | | | | | update the OSGi metadata for the javanano package
| * | update the OSGi SymbolicName and ExportedPackage for the javanano libraryDaniel Frett2016-08-301-2/+2
| | |
* | | Merge pull request #2031 from thomasvl/dont_require_filegeneratorsThomas Van Lenten2016-08-302-54/+14
|\ \ \ | |/ / |/| | Speed up ObjC Generation with large dependency trees
| * | Speed up ObjC Generation with large dependency treesThomas Van Lenten2016-08-302-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/rubymapgcfixJoshua Haberman2016-08-294-9/+59
|\ \ | | | | | | Ruby: make sure map parsing frames are GC-rooted.
| * | upb bugfix: JSON map entry keys were passing the wrong closure.Josh Haberman2016-08-291-1/+1
| | |
| * | Ruby: make sure map parsing frames are GC-rooted.Josh Haberman2016-08-263-8/+58
| |/
* | Merge pull request #1920 from gegles/masterJoshua Haberman2016-08-291-0/+2
|\ \ | | | | | | Fix missing import of jspb.Map (#1885)
| * | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-031-0/+2
| | |
* | | Merge pull request #2018 from thomasvl/support_generate_allThomas Van Lenten2016-08-295-58/+98
|\ \ \ | |_|/ |/| | ObjC support for GenerateAll().
| * | Support GenerateAll().Thomas Van Lenten2016-08-265-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/gmockFeng Xiao2016-08-252-7/+18
|\ \ \ | | | | | | | | Update gmock links.
| * | | Update links in appveyor.ymlFeng Xiao2016-08-251-3/+9
| | | | | | | | | | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
| * | | Update gmock links.Feng Xiao2016-08-251-4/+9
|/ / / | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
* | | Merge pull request #2011 from tomas-abrahamsson/patch-1Feng Xiao2016-08-251-0/+1
|\ \ \ | |/ / |/| | Add an Erlang project, gpb, to third_party.md
| * | Add an Erlang project, gpb, to third_party.mdTomas Abrahamsson2016-08-251-0/+1
|/ /
* | Merge pull request #2001 from nicolasnoble/patch-1Joshua Haberman2016-08-241-1/+1
|\ \ | | | | | | Fixing regular expression...
| * | Fixing regular expression...Nicolas Noble2016-08-231-1/+1
|/ / | | | | This will allow loading the extension for Ruby 2.1.10...
* | Merge pull request #1997 from thomasvl/move_include_package_into_helpersThomas Van Lenten2016-08-234-207/+224
|\ \ | | | | | | Move ImportWriter into helpers for sharing
| * | Remove the compiler options from ImportWriter.Thomas Van Lenten2016-08-233-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 Lenten2016-08-234-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 Lenten2016-08-238-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_testsThomas Van Lenten2016-08-224-0/+85
|\ \ | | | | | | More tests to shake out some cases in the json parsing
| * | More JSON testsThomas Van Lenten2016-08-224-0/+85
|/ / | | | | | | | | - String behaviors - Testing only valid JSON is allowed
* | Adds better support for protos without packages (#1979)Sergio Campamá2016-08-191-17/+51
| | | | | | | | Adds better support for protos without packages and more warnings on possible improvements
* | Merge pull request #1967 from sergiocampama/castThomas Van Lenten2016-08-161-4/+4
|\ \ | | | | | | Fixes #1844
| * | Adding casts so that code importing protobug using -Wconversion does not ↵Sergio Campama2016-08-161-4/+4
|/ / | | | | | | generate warnings.
* | Add more JSON tests around underscores (#1963)Thomas Van Lenten2016-08-165-39/+259
| | | | | | | | Add more JSON tests around underscores
* | Merge pull request #1957 from xfxyjwf/jenkins_badgeFeng Xiao2016-08-151-1/+1
|\ \ | | | | | | Add a jenkins test status badge.
| * | Add a jenkins test status badge.Feng Xiao2016-08-121-1/+1
| | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 01:20:04 +0000