aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1260 from legrosbuffle/masterPaul Yang2016-03-021-2/+4
|\ | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
| * Make cpp generated enum constants constexpr when Options::proto_h isClement Courbet2016-02-191-2/+4
| | | | | | | | specified.
* | Merge pull request #1287 from jskeet/fix-typoJon Skeet2016-03-011-1/+1
|\ \ | | | | | | Fix copy/paste typo in CodedInputStreamTest
| * | Fix copy/paste typo in CodedInputStreamTestJon Skeet2016-03-011-1/+1
|/ /
* | Merge pull request #1274 from murgatroid99/node_relative_requiresJoshua Haberman2016-02-298-11/+160
|\ \ | | | | | | Fix CommonJS relative require generation, and test it
| * | Moved CommonJS-specific files into commonjs directorymurgatroid992016-02-244-12/+15
| | |
| * | Fix CommonJS relative require generation, and test itmurgatroid992016-02-248-11/+157
| | |
* | | Merge pull request #1286 from jskeet/idisposableJan Tattermusch2016-02-295-12/+152
|\ \ \ | | | | | | | | Implement IDisposable for CodedInputStream and CodedOutputStream
| * | | Implement IDisposable for CodedInputStream and CodedOutputStreamJon Skeet2016-02-295-12/+152
|/ / / | | | | | | | | | | | | This fixes issue #679 and issue #1282. (The .gitignore change is just around ncrunch; I can put it in a separate PR if you really want.)
* | | Merge pull request #1233 from davidzchen/python-pathJisi Liu2016-02-254-96/+51
|\ \ \ | | | | | | | | Remove hack for building Python support with Bazel.
| * | | Remove hack for building Python support with Bazel.David Z. Chen2016-02-254-96/+51
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes use of new imports attribute for Bazel's Python rules, which enable adding directories to the PYTHONPATH. This allows us to remove the hack for building protobuf's Python support with Bazel and now allows projects to include protobuf using a Bazel external repository rather than requiring it to be imported directly into the source tree as //google/protobuf. This change also updates the protobuf BUILD file to use a named repository, @python//, for including Python headers rather than //util/python. This allows projects to specify their own package for Python headers when including protobuf with an external repository. Fixes #1230
* | | Merge pull request #1275 from keveman/grpc_supportJisi Liu2016-02-251-6/+11
|\ \ \ | | | | | | | | Fixed grpc C++ plugin support.
| * | | Fixed grpc C++ plugin support.Manjunath Kudlur2016-02-251-6/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc C++ plugin generates additional files, namely .grpc.pb.cc and .grpc.pb.h. Adding these files to the outs of the _proto_gen rule, so dependents don't complain about undeclared inclusions. Also, compiling the .grpc.pb.cc requires additional header files from the grpc library, so added //external:grpc_lib to the deps of the cc_library. Clients are expected to declare that in their bazel WORKSPACE, pointing it to @grpc//:grpc++{_unsecure}.
* | | Merge pull request #1259 from silviulica/masterJoshua Haberman2016-02-244-2/+14
|\ \ \ | | | | | | | | Add a modified patch from craigcitro@ to handle namespace sharing.
| * | | Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-184-2/+14
| | | |
* | | | Merge pull request #1268 from keveman/grpc_supportJisi Liu2016-02-231-0/+17
|\ \ \ \ | |_|/ / |/| | | Added grpc plugin support to cc_proto_library.
| * | | Added grpc plugin support to cc_proto_library.Manjunath Kudlur2016-02-221-0/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | cc_proto_library now supports use_grpc_plugin flag that passes --plugin=protoc-gen-grpc=grpc_cpp_plugin to protoc compiler invocation. grpc_cpp_plugin is assumed to be present as //external:grpc_cpp_plugin, so clients can setup their WORKSPACE files appropriately to point to grpc location using bind.
* | | Merge pull request #1267 from jskeet/vs2015Jan Tattermusch2016-02-221-3/+3
|\ \ \ | | | | | | | | Require VS2015 in the solution file
| * | | Require VS2015 in the solution fileJon Skeet2016-02-221-3/+3
| | | |
* | | | Merge pull request #804 from bsilver8192/masterFeng Xiao2016-02-223-0/+160
|\ \ \ \ | |/ / / |/| | | Add atomics support for 32-bit PPC.
| * | | Add atomics support for 32-bit PPC.Brian Silverman2015-09-093-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally submitted as a patch on the Google Code issue tracker, but the original author didn't submit a pull request. They did, however, give permission for somebody else to do so. I cleaned up a few things myself and am now submitting it. I can't find any record of what the original patch was, but there is a copy of the discussion at <https://groups.google.com/forum/#!topic/protobuf/SMwF5fYHIi0>. Fixes google/protobuf#581
* | | | Merge pull request #1215 from haberman/commonjsJoshua Haberman2016-02-1914-79/+667
|\ \ \ \ | | | | | | | | | | Added support for CommonJS require()
| * | | | Added a bit more to README.md, and allowed custom PROTOC var in tests.Josh Haberman2016-02-192-2/+28
| | | | |
| * | | | Properly camelCase when translating to CommonJS.Josh Haberman2016-02-181-1/+17
| | | | |
| * | | | Removed unused directives from tests that aren't run under CommonJS.Josh Haberman2016-02-182-4/+0
| | | | |
| * | | | Addressed more code review comments.Josh Haberman2016-02-182-22/+28
| | | | |
| * | | | Integrate review comments.Josh Haberman2016-02-185-6/+18
| | | | |
| * | | | Greatly expanded README.md.Josh Haberman2016-02-181-10/+130
| | | | |
| * | | | Use "node" as binary instead of "nodejs".Josh Haberman2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | "nodejs" does not exist on Travis, it appears.
| * | | | Fixed definition of extensions, and added CommonJS tests to Travis.Josh Haberman2016-02-183-2/+13
| | | | |
| * | | | Fixed nested message scopes for CommonJS.Josh Haberman2016-02-187-28/+46
| | | | |
| * | | | Added some documentation in comments.Josh Haberman2016-02-183-2/+31
| | | | |
| * | | | Moved CommonJS-specific files to commonjs/.Josh Haberman2016-02-185-4/+4
| | | | |
| * | | | CommonJS tests are now passing.Josh Haberman2016-02-1813-20/+152
| | | | |
| * | | | WIP.Josh Haberman2016-02-186-64/+286
| | | | |
* | | | | Merge pull request #1257 from thomasvl/objc_genericsThomas Van Lenten2016-02-1935-490/+588
|\ \ \ \ \ | |_|_|/ / |/| | | | Support ObjC Generic Collections
| * | | | Support ObjC Generic CollectionsThomas Van Lenten2016-02-1835-490/+588
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | - Extend GPB*ObjectDictionary to support generic syntax. - Update the generator to output generics so the enclosed type is exposed for compiler checks. - Use generics in a the public interfaces. - Update the generated sources that are checked in.
* | | | Merge pull request #1240 from jskeet/validate_groupJan Tattermusch2016-02-183-12/+77
|\ \ \ \ | | | | | | | | | | Validate that end-group tags match their corresponding start-group tags
| * | | | Validate that end-group tags match their corresponding start-group tagsJon Skeet2016-02-153-12/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This detects: - An end-group tag with the wrong field number (doesn't match the start-group field) - An end-group tag with no preceding start-group tag Fixes issue #688.
* | | | | Merge pull request #1258 from haberman/releasenotesJoshua Haberman2016-02-181-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Some fixes for the most recent release notes.
| * | | | Some fixes for the most recent release notes.Josh Haberman2016-02-181-1/+5
|/ / / /
* | | | Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failingThomas Van Lenten2016-02-181-0/+4
|\ \ \ \ | | | | | | | | | | List python_cpp as failing on OS X
| * | | | List python_cpp as failing on OS XThomas Van Lenten2016-02-181-0/+4
|/ / / /
* | | | Merge pull request #1254 from thomasvl/disable_xctool_updatesThomas Van Lenten2016-02-182-8/+8
|\ \ \ \ | | | | | | | | | | Disable the xctool updates
| * | | | Disable the xctool updatesThomas Van Lenten2016-02-182-8/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In light of https://github.com/google/protobuf/issues/1232, disable the xctool update so we stay on 0.2.7 which seems to work better. Remove the passing of -newSimulatorInstance since the older xctool doesn't support it.
* | | | Merge pull request #1239 from jskeet/call_generate_protosJon Skeet2016-02-182-1/+6
|\ \ \ \ | |_|/ / |/| | | Generate C# code whenever descriptor.proto changes
| * | | Generate C# code whenever descriptor.proto changesJon Skeet2016-02-152-1/+6
| |/ / | | | | | | | | | | | | | | | | | | This is a start to fixing issue #1212. It won't help for test protos, conformance etc, but it will definitely be better than nothing, and would have highlighted a change in descriptor.proto which broken C# earlier.
* | | Merge pull request #1229 from keveman/unlimited_binary_protoJoshua Haberman2016-02-172-4/+23
|\ \ \ | | | | | | | | Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when
| * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-162-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString.
* | | | Merge pull request #1241 from jskeet/more-merge-wrapper-testsJan Tattermusch2016-02-171-2/+41
|\ \ \ \ | | | | | | | | | | Add more tests around merging wrappers
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 14:58:42 +0000