aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | protoc-artifacts: Avoid checking out protobuf codeEric Anderson2018-03-282-3/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a bad idea to check out code into the docker image, as it will be out-of-date. It is better to have the image just be the environment, and let any scripts that need source check them out themselves. This fixes #4419 in that it allows the image to build again, albeit users would need to use wget to grab the source of the version of protobuf they wish.
* | | | Merge pull request #4452 from xfxyjwf/docFeng Xiao2018-04-022-71/+85
|\ \ \ \ | | | | | | | | | | Update instructions about getting protobuf source.
| * | | | Update instructions about getting protobuf source.Feng Xiao2018-03-292-71/+85
| |/ / /
* | | | Merge pull request #4464 from thomasvl/includes3Thomas Van Lenten2018-04-0243-40/+1351
|\ \ \ \ | |/ / / |/| | | Move ObjC WKTs to minimal imports to avoid import cycle.
| * | | Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
| | | | | | | | | | | | | | | | | | | | Since the generated header import GPBProtocolBuffers.h, there is no need to generate imports for the WKTs as they will have already been imported.
| * | | Add compile test sources for to test include order.Thomas Van Lenten2018-04-0228-0/+1229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure all headers aren't dependent on other things being imported before/after them, make a source that just imports each header and add it to the unittesting target, that way we ensure it can be included on its own with ordering issues. Also do this testing with a few generated headers that aren't part of the library to help ensure the different generated imports needed are complete.
| * | | Trim imports for bundled generated protos.Thomas Van Lenten2018-04-0213-33/+102
|/ / / | | | | | | | | | | | | | | | | | | | | | To avoid a cycle between headers, have the WKTs use minimal imports instead of using the helper to get everything from the library. Fixes https://github.com/google/protobuf/issues/4301 Fixes https://github.com/google/protobuf/issues/4403
* | | Merge pull request #4433 from xfxyjwf/licenseFeng Xiao2018-03-281-11/+1
|\ \ \ | | | | | | | | Cleanup LICENSE file.
| * | | Cleanup LICENSE file.Feng Xiao2018-03-261-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove copyright attributions to files that no longer exist; Change the year to 2008 to be consistent with the copyright header of other source files.
* | | | Merge pull request #4445 from xfxyjwf/badgeFeng Xiao2018-03-281-14/+12
|\ \ \ \ | | | | | | | | | | Add kokoro build status badges.
| * | | | Add kokoro build status badges.Feng Xiao2018-03-271-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Moved the badges to the language table as they are per-language based. Some badges are not yet available due to stuck kokoro jobs.
* | | | | Merge pull request #4442 from xfxyjwf/cleanFeng Xiao2018-03-2710-692/+0
|\ \ \ \ \ | |/ / / / |/| | | | Delete unused directories.
| * | | | Delete unused directories.Feng Xiao2018-03-2710-692/+0
|/ / / / | | | | | | | | | | | | jenkins has been replaced by kokoro and we never use more_tests.
* | | | Merge pull request #4439 from acozzette/remove-atomicops-stubAdam Cozzette2018-03-272-238/+1
|\ \ \ \ | | | | | | | | | | Removed atomicops.h stub
| * | | | Updated .gitignore to exclude downloaded gmock/ directoryAdam Cozzette2018-03-271-1/+1
| | | | |
| * | | | Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
|/ / / /
* | | | Merge pull request #3794 from jskeet/reflectionJan Tattermusch2018-03-274-40/+166
|\ \ \ \ | | | | | | | | | | Change C# reflection to avoid using expression trees
| * | | | Address review commentsJon Skeet2018-03-271-5/+13
| | | | |
| * | | | Add extra C# file to Makefile.amJon Skeet2018-03-271-0/+1
| | | | |
| * | | | Work around an "old runtime" issue with reflectionJon Skeet2018-03-271-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For oneofs, to get the case, we need to call the property that returns the enum value. We really want it as an int, and modern runtimes allow us to create a delegate which returns an int from the method. (I suspect that the MS runtime has always allowed that.) Old versions of Mono (e.g. used by Unity3d) don't allow that, so we have to convert the enum value to an int via boxing. It's ugly, but it should work.
| * | | | Introduce a compatiblity shim to support .NET 3.5 delegate creationJon Skeet2018-03-272-0/+51
| | | | |
| * | | | Change C# reflection to avoid using expression treesJon Skeet2018-03-272-34/+54
|/ / / / | | | | | | | | | | | | | | | | | | | | This should work on Unity, Mono and .NET 3.5 as far as I'm aware. It won't work on platforms where reflection itself is prohibited, but that's a non-starter basically.
* | | | Merge pull request #4432 from xfxyjwf/rmnanokokoroFeng Xiao2018-03-266-78/+0
|\ \ \ \ | | | | | | | | | | Delete javanano kokoro build configs.
| * | | | Delete javanano kokoro build configs.Feng Xiao2018-03-266-78/+0
| |/ / / | | | | | | | | | | | | Their job configs are being deleted in cl/190526138
* | | | Merge pull request #4434 from xfxyjwf/buildstatusFeng Xiao2018-03-261-1/+1
|\ \ \ \ | |/ / / |/| | | Remove broken build status icons.
| * | | Remove broken build status icons.Feng Xiao2018-03-261-1/+1
|/ / /
* | | Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-2616-120/+82
| | | | | | | | | Add googletest as a submodule in third_party/googletest.
* | | source code info for interpreted options; fix source code info for extension ↵Joshua Humphries2018-03-264-68/+748
| | | | | | | | | | | | | | | | | | | | | | | | | | | range options (#4342) * when interpreting options, rewrite file descriptor's source code info - so that interpreted option paths have correct location information - so that corresponding uninterpreted option paths are removed also includes a fix to source code locations for extension range options
* | | Merge pull request #4431 from xfxyjwf/rmnanoFeng Xiao2018-03-2669-17060/+11
|\ \ \ | | | | | | | | Remove javanano.
| * | | Remove javanano.Feng Xiao2018-03-2669-17060/+14
| | | |
* | | | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵Alexey Malov2018-03-262-2/+2
| | | | | | | | | | | | | | | | (#4350)
* | | | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ \ \ | | | | | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it alwa…
| * \ \ \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22339-14979/+19144
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use the first enum value instead of 0 in ↵stone47742018-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | DefaultValueObjectWriter::FindEnumDefault
| * | | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵stone47742018-03-195-17/+66
| | | | | | | | | | | | | | | | | | | | print the default value of enums as strings
* | | | | Merge pull request #4424 from egorpugin/patch-1Feng Xiao2018-03-261-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix missing LIBPROTOC_EXPORT.
| * | | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
|/ / / / / | | | | | | | | | | This makes possible to build grpc_php_plugin with protobuf in shared mode.
* | | | | Merge pull request #4413 from pmuetschard/msvcAdam Cozzette2018-03-231-13/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't assume Windows builds use MSVC.
| * | | | | Don't assume Windows builds use MSVC.Pascal Muetschard2018-03-221-13/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Switch to using the MSVC options, not based on the cpu, but based on the compiler name. This allows building on Windows with MSYS or MinGW's gcc.
* | | | | Merge pull request #4422 from acozzette/ruby-conformanceAdam Cozzette2018-03-231-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Updated Ruby conformance test failure list
| * | | | | Updated Ruby conformance test failure listAdam Cozzette2018-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds two entries to the conformance failure list for Ruby. It seems that these particular test cases have been failing since they were introduced in 5140bae3834c40208e44b1eeb947485a832387a7, so there has not been any regression.
* | | | | | Merge pull request #4421 from acozzette/fix-bazel-buildAdam Cozzette2018-03-231-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added missing .inc files to BUILD
| * | | | | Added missing .inc files to BUILDAdam Cozzette2018-03-231-0/+3
|/ / / / / | | | | | | | | | | | | | | | This fixes the Bazel build.
* | | | | Merge pull request #4346 from BSBandme/performance_resultYilun Chong2018-03-222-1/+318
|\ \ \ \ \ | |_|_|/ / |/| | | | Add performance.md and add instruction for linking tcmalloc
| * | | | Add performance.md and add instruction for linking tcmallocYilun Chong2018-03-222-1/+318
| | | | |
* | | | | Merge pull request #4412 from acozzette/remove-old-filesAdam Cozzette2018-03-2224-4907/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Removed some unused C++ source files
| * | | | Removed some unused C++ source filesAdam Cozzette2018-03-2224-4907/+2
|/ / / /
* | | | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-20312-14342/+15463
|\ \ \ \ | | | | | | | | | | Integrated internal changes from Google
| * | | | Removed unused variables in repeated_scalar_container.ccAdam Cozzette2018-03-201-12/+0
| | | | |
| * | | | Try using a new version of Visual Studio on AppVeyorAdam Cozzette2018-03-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We need to use a new enough version to ensure that constexpr is available.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 12:12:15 +0000