aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | Merge pull request #2121 from mazurkin/issue-2108Gravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | issue-2108 [protoc/Java] Excessive copying on buildPartial()
| | | | | | | | | * Added Kokoro protoc release build for OS X (#4770)Gravatar Adam Cozzette2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration builds both 32-bit and 64-bit binaries for Mac OS X. One thing I had to change was to increase our minimum supported version for 10.7 to 10.9, because 10.9 (Mavericks) appears to be the earliest version supporting C++11.
* | | | | | | | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707)Gravatar medinandres2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * proto_writer.h: RenderBytes is an override. Marking it.
* | | | | | | | | | Merge pull request #4739 from asimshankar/tf-bytesizeGravatar Feng Xiao2018-06-18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Graceful failure in SerializeToArray().
| | | | | | | | | | * Work around MSVC issue with std::atomic initialization (#4777)Gravatar Adam Cozzette2018-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Work around MSVC issue with std::atomic initialization MSVC seems to have a bug where it does not use constant initialization for std::atomic, which ends up causing crashes during initialization. This change introduces a workaround by putting the std::atomic inside a union, which causes the compiler to use constant initialization for it. * Added an AppVeyor test for static linking with MSVC
| | | | | | | | | | * Added Kokoro Windows release build config for protoc (#4766)Gravatar Adam Cozzette2018-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make it easy to automatically build 32-bit and 64-bit Windows protoc binaries.
* | | | | | | | | | | Merge pull request #4760 from dslomov/fix-buildfile-referencesGravatar Feng Xiao2018-06-13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update build file locations.
| * | | | | | | | | | | Update build file locations.Gravatar Dmitry Lomov2018-06-13
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/bazelbuild/bazel/issues/5383.
* | | | | | | | | | | Merge pull request #4755 from xfxyjwf/fix_benchmarks_linkGravatar Yilun Chong2018-06-12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect link.
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4748 from cmclean/masterGravatar Feng Xiao2018-06-12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make proto_api target visible
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4758 from dslomov/patch-1Gravatar Feng Xiao2018-06-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate to supported version of http_archive
| * | | | | | | | | | | | | Fix typoGravatar Dmitry Lomov2018-06-12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Migrate to supported version of http_archiveGravatar Dmitry Lomov2018-06-12
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4727.
| | * / / / / / / / / / / Fix incorrect link.Gravatar Feng Xiao2018-06-11
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2811 from Dunemaster/masterGravatar Feng Xiao2018-06-11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Java: Mark sun.misc dependency as optional
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3901 from wijagels/masterGravatar Feng Xiao2018-06-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unused parameter warnings in generated code with arenas enabled
* | | | | | | | | | | | | | import inspect (#3507)Gravatar cclauss2018-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspect is used five times on line 65-74 without being imported.
| | | * | | | | | | | | | | Make proto_api target visibleGravatar Cory McLean2018-06-11
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4725 from ThomasColthurst/patch-2Gravatar Feng Xiao2018-06-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cycle in dependency graph
| | | | | | | | | | | | | * Use legacy name in php runtime (#4741)Gravatar Paul Yang2018-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use legacy name in php runtime Old generated code cannot work with new runtime, because the new runtime assumes new class name for nested message. For details see #4738. * Remove unused method
| | | | * | | | | | | | | | Graceful failure in SerializeToArray().Gravatar Asim Shankar2018-06-07
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/tensorflow/tensorflow/issues/19657 for motivation. But long story short, without this change: m.SerializeToArray(buffer, m.ByteSizeLong()); would result in a CHECK failure if m.ByteSizeLong() returned a value >2GB.
| | | | | | | | | | | | * Update php version to 3.6.0 (#4736)Gravatar Paul Yang2018-06-06
| | | | | | | | | | | | |
| | | | | | | | | | | | * Merge pull request #4713 from acozzette/changelogGravatar Adam Cozzette2018-06-06
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the change log with changes for 3.6.0
| | | | | | | | | | | | * \ Merge pull request #4730 from acozzette/xcodeGravatar Adam Cozzette2018-06-06
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked XCode 10 fixes into 3.6.x branch
* | | | | | | | | | | | | | | Align Bazel on Windows with CMake's MSVC flags (#4720)Gravatar Loo Rong Jie2018-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Align Bazel on Windows with CMake's MSVC flags
| | | | | | | | | | | | | * | Update code to work for Xcode 10b1 (#4729)Gravatar Sergio Campamá2018-06-05
| | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update code to work for Xcode 10b * Update README and test scripts to mention that Xcode 7 is no longer supported
* | | | | | | | | | | | | | Update code to work for Xcode 10b1 (#4729)Gravatar Sergio Campamá2018-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update code to work for Xcode 10b * Update README and test scripts to mention that Xcode 7 is no longer supported
| | | | | | | | | | | | | * Removed javanano from post_process_dist.shGravatar Adam Cozzette2018-06-05
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove cycle in dependency graphGravatar Thomas Colthurst2018-06-04
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_pluginGravatar Yilun Chong2018-06-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proto2 to proto3 util
| * | | | | | | | | | | | | FixGravatar Yilun Chong2018-06-04
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4698 from ThomasColthurst/proto_c_apiGravatar Feng Xiao2018-06-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfa
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4714 from dcarp/reference_protobuf_dGravatar Feng Xiao2018-06-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to protobuf-d
| * | | | | | | | | | | | | | | Add reference to protobuf-dGravatar Dragos Carp2018-06-02
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/dcarp/protobuf-d is a conformance tested proto3 runtime library and code generator for D.
| | | | | | | | | | | | | | * Updated the change log with changes for 3.6.0Gravatar Adam Cozzette2018-06-01
| | | | | | | | | | | | | |/
* | | | | | | | | | | | | | Remove js_embed binary. (#4709)Gravatar Feng Xiao2018-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove js_embed binary.
* | | | | | | | | | | | | | Merge pull request #4710 from jtattermusch/upport_4706Gravatar Adam Cozzette2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upport to master: Require C++11 and pass -std=c++11
| * | | | | | | | | | | | | | Require C++11 and pass -std=c++11Gravatar Adam Cozzette2018-06-01
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the Autotools build to require a C++11 compiler and explicitly pass -std=c++11. This seems to be necessary for enabling C++11 support in older compilers.
| | | | | | | | | | | | | * Merge pull request #4706 from acozzette/cxx-11Gravatar Adam Cozzette2018-05-31
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require C++11 and pass -std=c++11
* | | | | | | | | | | | | | \ Merge pull request #4703 from acozzette/thread-safety-annotationsGravatar Adam Cozzette2018-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Clang thread-safety annotations in mutex.h
| | | | | | | | | | | | | | | * Require C++11 and pass -std=c++11Gravatar Adam Cozzette2018-05-31
| | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the Autotools build to require a C++11 compiler and explicitly pass -std=c++11. This seems to be necessary for enabling C++11 support in older compilers.
| | | * | | | | | | | | | | | Add proto2 to proto3 utilGravatar Yilun Chong2018-05-30
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * Merge pull request #4702 from TeBoring/3.6.xGravatar Paul Yang2018-05-30
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick changes into 3.6.x
| * | | | | | | | | | | | | | | Added Clang thread-safety annotations in mutex.hGravatar Adam Cozzette2018-05-30
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Clang's thread safety analysis (-Wthread-safety) to pass without warnings, we need to annotate WrappedMutex to indicate that Lock() acquires the lock and Unlock() releases it. This CL adds the annotations and guards them with an ifdef to make sure they're a no-op on compilers other than Clang. This is a cherry-pick of a change I already made to the Google-internal codebase.
* | | | | | | | | | | | | | | Merge pull request #4676 from acozzette/update-changelog-scriptGravatar Adam Cozzette2018-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated generate_changelog.py
| | | | | | | | | | | | | | | * Move methods out of class (#4697)Gravatar Paul Yang2018-05-30
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * Add back GeneratedClassName to public (#4686)Gravatar Paul Yang2018-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods are used by grpc
* | | | | | | | | | | | | | | | Merge pull request #4643 from acozzette/merge-3-5-xGravatar Adam Cozzette2018-05-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 3.5.x branch into master
| | | | | | | | | | | | | | | * \ Merge pull request #4696 from acozzette/csharp-fixGravatar Adam Cozzette2018-05-30
| | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | |/| Removed duplicate using statement from ReflectionUtil.cs
| | | * | | | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfaGravatar Thomas Colthurst2018-05-30
| | | | | | | | | | | | | | | | |