aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1765 from mbarbon/masterFeng Xiao2016-09-121-0/+1
|\ | | | | Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
| * Add https://metacpan.org/pod/Google::ProtocolBuffers::DynamicMattia Barbon2016-07-091-0/+1
| | | | | | | | | | | | | | Uses Google's C++ library for .proto parsing and uPB for protobuf encoding/decoding; it supports both proto2 and proto3 syntax and encoding/decoding is more than 10 times faster than pure-Perl Google::ProtocolBuffers.
* | Merge pull request #2021 from zlim/bench-fixFeng Xiao2016-09-121-13/+9
|\ \ | | | | | | benchmarks: update readme.txt
| * | benchmarks: update readme.txtZi Shen Lim2016-08-261-13/+9
| | | | | | | | | | | | | | | | | | | | | Remove references to google_speed.proto which was removed in commit 2e83110230b7. Also fix-up commands to build and run.
* | | Merge pull request #2100 from vladmos/patch-1Feng Xiao2016-09-121-2/+2
|\ \ \ | | | | | | | | Compatibility with the new version of Bazel.
| * \ \ Resolved a conflictVladimir Moskva2016-09-1243-85/+649
| |\ \ \
| * | | | Compatibility with the new version of Bazel.Vladimir Moskva2016-09-091-2/+2
| | | | | | | | | | | | | | | Global variable HOST_CFG is deprecated and will not be supported soon.
* | | | | Merge pull request #2092 from dprotaso/masterFeng Xiao2016-09-122-6/+38
|\ \ \ \ \ | |_|/ / / |/| | | | Allow the JsonFormat.Parser to ignore unknown fields
| * | | | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
| | | | | | | | | | | | | | | | | | | | The default behaviour of throwing an exception remains
* | | | | Merge pull request #2044 from wychen/Win32ANSIFeng Xiao2016-09-096-15/+25
|\ \ \ \ \ | | | | | | | | | | | | Fix Win32 error messages on Unicode build
| * | | | | Rename UNICODE to protobuf_UNICODEWei-Yin Chen (陳威尹)2016-09-012-3/+3
| | | | | |
| * | | | | Fix Win32ErrorMessage on Unicode buildWei-Yin Chen (陳威尹)2016-08-311-6/+6
| | | | | |
| * | | | | Add test for Win32ErrorMessageWei-Yin Chen (陳威尹)2016-08-311-0/+5
| | | | | |
| * | | | | Support Unicode build on WindowsWei-Yin Chen (陳威尹)2016-08-314-9/+14
| | | | | |
* | | | | | Merge pull request #1636 from yugui/feature/generic-pluginJisi Liu2016-09-091-10/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Generalize plugin support in Bazel Skylark rule
| * | | | | | Generalize plugin support in Bazel Skylark ruleYuki Yugui Sonoda2016-06-011-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It helps users to support their own plugins in a manner consistent to cc_proto_library and py_proto_libary in their skylark rules
* | | | | | | Merge pull request #2090 from guoxiao/findFeng Xiao2016-09-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | include std::find()
| * | | | | | | include std::find()Guo Xiao2016-09-081-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2103 from adrianludwin/fix-gtestFeng Xiao2016-09-092-22/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update repo in Bazel build files to use googletest instead of the deprecated gMock
| * | | | | | | Update repo to use google testAdrian Ludwin2016-09-092-22/+22
| | | | | | | |
* | | | | | | | Merge pull request #1970 from thomasvl/objc_any_helpersThomas Van Lenten2016-09-0934-38/+557
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Objc any helpers
| * | | | | | | Add ObjC helpers for Any WKT.Thomas Van Lenten2016-09-0834-38/+557
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Capture the ObjC prefix used when generating the the file. - Track the containing type on descriptors. - Mark descriptors where the message class name got a suffix added to it. - Expose a fullName property on Descriptors. - Add helpers for packing/unpacking Any messages. - Bump the ObjC runtime version number. Since we added methods and invoke them in the generated code, ensure the code is running against a matching version. Otherwise, someone could compile against headers, but run with a framework that is older and get unknown selector failures. This should trip clearer messaging. Fixes https://github.com/google/protobuf/issues/1674
* | | | | | | 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)