aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include no_package.proto in Python testAdam Cozzette2018-03-142-0/+2
|
* Deleted scoped_ptr.hAdam Cozzette2018-03-1427-311/+49
| | | | | We no longer need this, now that we have finished the switch to C++11 and are using std::unique_ptr.
* Updated checked-in generated codeAdam Cozzette2018-03-142-4/+4
|
* Fixed up proto3_lite_unittest.ccAdam Cozzette2018-03-141-11/+11
|
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-1333-697/+3583
|\
| * Merge pull request #4378 from acozzette/node-bufferAdam Cozzette2018-03-131-0/+4
| |\ | | | | | | Revert "Removed mention of Buffer in byteSourceToUint8Array"
| | * Revert "Removed mention of Buffer in byteSourceToUint8Array"Adam Cozzette2018-03-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f00e06c95bc117fb2ed0ca56c96041c93039f1fe. Although Node Buffers are not covered by the tests, it seems that there are users relying on them, so we need to add back in support for them. This fixes issue #4359.
| * | Merge pull request #4167 from mike9005/patch-1Joshua Haberman2018-03-131-2/+2
| |\ \ | | | | | | | | Ruby: Fix scope resolution for MessageExts
| | * | Fix scope resolution for MessageExts in RubyMichael Collis2018-01-121-2/+2
| | | |
| * | | Merge pull request #4380 from mateuszmatejczyk/patch-1Jisi Liu2018-03-121-3/+6
| |\ \ \ | | | | | | | | | | Output *_pb2_grpc.py files when use_grpc_plugin=True
| | * | | Output *_pb2_grpc.py when use_grpc_plugin=TrueMateusz Matejczyk2018-03-111-3/+6
| | | |/ | | |/| | | | | Start outputting missing *_pb2_grpc.py files when use_grpc_plugin is set to True for py_proto_library.
| * | | Merge pull request #1333 from cgull/pkg-config-issueJisi Liu2018-03-123-400/+487
| |\ \ \ | | |/ / | |/| | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
| | * | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4john hood2016-03-183-400/+487
| | | |
| * | | Merge pull request #4347 from xfxyjwf/pluginpbFeng Xiao2018-03-094-3/+3
| |\ \ \ | | | | | | | | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
| | * | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Feng Xiao2018-03-014-3/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
| * | | | Merge pull request #4375 from jo2y/protoc-defaultFeng Xiao2018-03-092-5/+5
| |\ \ \ \ | | | | | | | | | | | | Replace //:protoc and similar default macro arguments with
| | * | | | Replace //:protoc and similar default macro arguments withJames O'Kane2018-03-082-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @com_google_protobuf prefixed versions. This allows them to work in 3rd party repositories. Fix a bad visibility rule. :hidden does not exist, but :private does.
| * | | | Sync upb change (#4373)Paul Yang2018-03-082-195/+2783
| | | | |
| * | | | Convert descriptortype to type for upb_msgval_sizeof (#4357)Paul Yang2018-03-061-1/+1
| | | | |
| * | | | For encoding upb needs descriptor type instead of type. (#4354)Paul Yang2018-03-062-13/+13
| | | | |
| * | | | Merge pull request #4355 from acozzette/typoAdam Cozzette2018-03-051-1/+1
| |\ \ \ \ | | |/ / / | |/| | | PHP: fixed typo in message.c
| | * | | PHP: fixed typo in message.cAdam Cozzette2018-03-051-1/+1
| |/ / /
| * | | Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-262-2/+3
| |\ \ \ | | | | | | | | | | Add support for libc++ on Windows.
| | * | | Add support for libc++ on Windows.Peter Collingbourne2018-01-172-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
| * | | | Merge pull request #4333 from jmillikin/update-file-lists-needs-bashFeng Xiao2018-02-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.
| | * | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.John Millikin2018-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed that running this script as `./update_file_lists.sh` on MacOS was corrupting `cmake/extract_includes.bat.in`. Forcing the shell to Bash fixes the generated file output.
| * | | | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsFeng Xiao2018-02-264-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
| | * | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.John Millikin2018-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the Bazel `CcProtoAspect` from generating and linking C++ object code for these files. Without this blacklist, symbols for protobuf types depended on by `libprotobuf` may be defined multiple times and violate the ODR rule. Fixes https://github.com/google/protobuf/issues/4311
| | * | | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-244-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
| * | | | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
| |\ \ \ \ \ | | | | | | | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values
| | * | | | | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
| | | |/ / / | | |/| | | | | | | | | | | | | | | unrecognized string values in enum fields as default ones.
| * | | | | Merge pull request #4291 from google/3.5.xJisi Liu2018-02-2612-61/+189
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Merge 3.5.x to master
| | * | | | Merge pull request #4236 from pherl/3.5.xJisi Liu2018-01-261-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | Bumping number to fix ruby 2.1 on mac
| | | * | | | Bumping number to fix ruby 2.1 on macJisi Liu2018-01-261-1/+1
| | | | | | |
| | * | | | | Fix more memory leak for php c extension (#4211)Paul Yang2018-01-257-27/+117
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5
| | * | | | Merge pull request #4185 from pherl/ruby2.5Jisi Liu2018-01-171-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Update rake file to build of 2.1.6.
| | | * | | | Update rake file to build of 2.1.6.Jisi Liu2018-01-171-2/+2
| | | | | | |
| | * | | | | Merge pull request #4182 from pherl/ruby2.5Jisi Liu2018-01-172-3/+3
| | |\| | | | | | | | | | | | | | | | | | Support ruby2.5
| | | * | | | Support ruby2.5Jisi Liu2018-01-172-3/+3
| | | | | | |
| | * | | | | Well known types are not initialized properly. (#4139)Paul Yang2018-01-053-30/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, within the same load period of protobuf module, well known types are not initialized correctly for the second request. The reason is that well known type are only initialized if a method local static variable is not set. However, that variable is not reset after request ends. Therefore, when the second request comes, the method local static variable is still set (by previous request) and well types are not initialized in this case.
| | * | | | | Merge pull request #4146 from pherl/fix_protocJisi Liu2018-01-051-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Bump protoc-artifact version for a patch rebuild
| | | * | | | | Bump protoc-artifact version for a patch rebuildJisi Liu2018-01-051-1/+1
| | | |/ / / /
| * | | | | | Merge pull request #4324 from abdul-sami/masterFeng Xiao2018-02-221-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added instruction for existing ZLIB configuration
| | * | | | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1Abdul Sami2018-02-211-0/+5
| |/| | | | | | | | | | | | | | | | | | | | | | Added instruction for existing ZLIB configuration
| | * | | | | | Added instruction for existing ZLIB configurationAbdul Sami2018-02-211-0/+5
| |/ / / / / / | | | | | | | | | | | | | | Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
| * | | | | | Merge pull request #4323 from dtapuska/masterFeng Xiao2018-02-201-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Rename a shadowed variable.
| | * | | | | | Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shadowed variables can cause readability issues. Ensure a shadowed variable isn't used in header files which may be used in a dependent project that explicitly disables them.
| * | | | | | | Merge pull request #3186 from gkelly/remove-unused-variableFeng Xiao2018-02-201-2/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Remove unused output_file variable from js_embed
| | * | | | | | Remove unused output_file variable from js_embedGarret Kelly2017-06-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The js_embed tool outputs to stdout, so the output_file variable is unnecessary and unused.
| * | | | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile()
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 09:50:47 +0000