aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #4504 from xfxyjwf/liteFeng Xiao2018-04-188-274/+122
|\ \ | | | | | | Cleanup + documentation for Java Lite runtime.
| * | Update Makefile.am for Java lite files.Feng Xiao2018-04-181-3/+1
| | |
| * | Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-127-271/+121
| | |
* | | Merge pull request #4517 from rcane/feature/vc2017_build_fixAdam Cozzette2018-04-168-20/+13
|\ \ \ | | | | | | | | Fixed a Visual Studio 2017 build error. (#4488)
| * | | Fixed a Visual Studio 2017 build error. (#4488)Ronny Krüger2018-04-168-20/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current 15.6.x versions of Visual Studio 2017 contain a bug that prevent them from compiling the following construct under certain conditions: std::unique_ptr<std::unique_ptr<Foo> []> foos; This will fail to compile if Foo is an abstract class. To work-around the problem the whole construct was change into: std::vector<std::unique_ptr<Foo>> foos; This not only fixes the compiler error but is also more readable than previous version.
* | | Merge pull request #4510 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-04-163-117/+10
|\ \ \ | |/ / |/| / | |/ fix java benchmark, fix dashboard build
| * fix java benchmark, fix dashboard buildYilun Chong2018-04-133-117/+10
|/
* Merge pull request #4478 from BSBandme/proto2_to_proto3_toolsYilun Chong2018-04-106-53/+584
|\ | | | | Add gogo benchmark
| * fix pythonYilun Chong2018-04-101-2/+4
| |
| * fix conflictsYilun Chong2018-04-1011-132/+638
| |\
| * | Add gogo benchmarkYilun Chong2018-04-109-122/+685
| | |
* | | Merge pull request #4415 from BSBandme/experiementYilun Chong2018-04-1014-208/+743
|\ \ \ | | |/ | |/| Add dashboard support
| * | Add script for run and upload the benchmark result to bqYilun Chong2018-04-1015-208/+748
| |/
* | fix json_decode call parameters (#4381)urfinjuezz2018-04-091-1/+1
| |
* | includes the expected class in the exception, otherwise the error is harder ↵Brent Shaffer2018-04-091-1/+1
| | | | | | | | to track down (#3371)
* | Add __init__.py files to compiler and util subpackages (#4117)Thomas Hisch2018-04-095-11/+3
| | | | | | | | | | | | The compiler and util subpackages are created by the build_py class in setup.py. This has caused an issue in the protobuf package in conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40), which is fixed by this commit.
* | For windows, all python version should use /MT (#4468)Paul Yang2018-04-061-3/+1
| |
* | Add the files added in #4485.Thomas Van Lenten2018-04-061-0/+2
| |
* | Update Xcode settingsSergio Campama2018-04-068-18/+42
| |
* | Deliberately call simple code to avoid Unity linker pruningJon Skeet2018-04-061-0/+19
| | | | | | | | | | | | | | | | | | The SampleEnumMethod method was previously only called via reflection, so the Unity linker thought it could be removed. Ditto the parameterless constructor in ReflectionHelper. This PR should avoid that issue, reducing the work needed by customers to use Google.Protobuf from Unity.
* | Merge pull request #4475 from chenchuanyin/patch-1Feng Xiao2018-04-051-0/+3
|\ \ | | | | | | Fix problem: cmake build failed in c++11 by clang
| * | Fix problem: cmake build failed in c++11 by clangSilver Chan2018-04-041-0/+3
| | | | | | | | | CMakeLists.txt adds c++11 flags for clang
* | | Merge pull request #4283 from ObsidianMinor/csharp/better-test-runnersFeng Xiao2018-04-046-60/+9
|\ \ \ | |/ / |/| | [C#] Update test project to be used with dotnet test and Visual Studio Test Explorer
| * | Updated csharp/README.md to reflect testing changesObsidianMinor2018-04-041-4/+2
| | |
| * | Remove Google.Protobuf.Test/Program.cs from Makefile.amObsidianMinor2018-02-061-1/+0
| | |
| * | Adjusted appveyor batchObsidianMinor2018-02-061-2/+2
| | |
| * | Updated NUnit packages, removed NUnitLite added packages for dotnet and ↵ObsidianMinor2018-02-063-53/+5
| | | | | | | | | | | | Visual Studio, changed dotnet command in buildall to dotnet test, and deleted Program.cs (because it's no longer required).
* | | Merge branch (#4466)Paul Yang2018-04-0214-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits
* | | js message support for jstype string on integers (#4332)Charlie Moad2018-04-021-0/+11
| | |
* | | Merge pull request #4467 from xfxyjwf/errorFeng Xiao2018-04-021-1/+6
|\ \ \ | | | | | | | | Improve error message when googletest is missing.
| * | | Improve error message when googletest is missing.Feng Xiao2018-04-021-1/+6
| | | |
* | | | Merge pull request #4411 from pravin-dsilva/protobuf-ppc64leFeng Xiao2018-04-023-2/+10
|\ \ \ \ | | | | | | | | | | Add support for Power (ppc64le) arch
| * | | | Add support for power ppc64lepravin-dsilva2018-03-223-2/+10
| | |_|/ | |/| |
* | | | Merge pull request #4447 from ejona86/cleaner-protoc-artifactsFeng Xiao2018-04-023-11/+32
|\ \ \ \ | | | | | | | | | | Cleaner protoc artifacts
| * | | | protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1Eric Anderson2018-03-283-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENTRYPOINT is used even when other commands are specified on the "docker run" command line. This allows running one-off commands in the docker image (especially combined with volume binding with the host) with the correct environment variables.
| * | | | protoc-artifacts: Avoid storing temporary files and use fewer layersEric Anderson2018-03-281-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This is just better Dockerfile hygene as it produces smaller resulting images with fewer useless files.
| * | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 18:41:12 +0000