aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* not to use std::random_device for map.Seed(). (#3133)Gravatar Wayne Zhang2017-05-30
| | | | | | * not to use std::random_device for map.Seed(). * remove include random
* Merge pull request #3149 from KarrokDC/masterGravatar Adam Cozzette2017-05-30
|\ | | | | Add headers as part of cmake project generation
* | Oneof field should be serialized even it's equal to default. (#3153)Gravatar Paul Yang2017-05-29
| |
* | Add ARRAY for reserved name (#3150)Gravatar Paul Yang2017-05-29
| |
* | Adds fluent setters for PHP (#3130)Gravatar Brent Shaffer2017-05-29
| |
| * Add headers as part of cmake projectGravatar Dennis Cappendijk2017-05-29
|/ | | | tested only on windows with visual studio 2015 as generator
* Merge pull request #3113 from phst/masterGravatar Adam Cozzette2017-05-26
|\ | | | | Improve fix for https://github.com/google/protobuf/issues/295
* | update csharp README and fix .NET 3.5 build errorGravatar John Brock2017-05-25
| |
* | Add IncludeSource in csproj as per review commentsGravatar Jon Skeet2017-05-24
| |
* | Convert C# projects to MSBuild (csproj) formatGravatar Jon Skeet2017-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has one important packaging change: the netstandard version now depends (implicitly) on netstandard1.6.1 rather than on individual packages. This is the preferred style of dependency, and shouldn't affect any users - see http://stackoverflow.com/questions/42946951 for details. The tests are still NUnit, but NUnit doesn't support "dotnet test" yet; the test project is now an executable using NUnitLite. (When NUnit supports dotnet test, we can adapt to it.) Note that the project will now only work in Visual Studio 2017 (and Visual Studio Code, and from the command line with the .NET Core 1.0.0 SDK); Visual Studio 2015 does *not* support this project file format.
* | Removing undefined behavior and compiler warnings (#1315)Gravatar brian-peloton2017-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Comment out unused arguments. These last few are all that's needed to compile with -Wunused-arguments. * Fix missing struct field initializer. With this fix, everything compiles with -Wmissing-field-initializers. * Add support for disabling unaligned memory accesses on x86 too. ubsan doesn't like these because they are technically undefined behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily. * Avoid undefined integer overflow. ubsan catches all of these.
* | Merge pull request #3126 from mbrukman/fix-readme-formattingGravatar Feng Xiao2017-05-23
|\ \ | | | | | | Fix Markdown formatting in README.
* \ \ Merge pull request #3117 from KarrokDC/masterGravatar Feng Xiao2017-05-23
|\ \ \ | | | | | | | | Show help if protoc is called without any arguments
* \ \ \ Merge pull request #3103 from sergiocampama/perfGravatar Thomas Van Lenten2017-05-23
|\ \ \ \ | | | | | | | | | | Adds serial and parallel parsing tests.
| * | | | Adds serial and parallel parsing tests to check if parallel parsing is ↵Gravatar Sergio Campama2017-05-23
|/ / / / | | | | | | | | | | | | faster than serial parsing, which it should
| | * / Fix Markdown formatting in README.Gravatar Misha Brukman2017-05-23
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation to enable code formatting for sample command lines to set them visually apart from the surrounding text, and make it easy to copy-paste. Add code formatting for env vars, paths, binary and library names for readability. Hide URLs behind text for readability and conciseness.
| | * Improve fix for https://github.com/google/protobuf/issues/295Gravatar Philipp Stephani2017-05-23
| |/ |/| | | | | | | | | | | | | Requiring the legacy ‘cl’ library unconditionally pollutes the namespace. Instead, require it only when compiling and in known-broken versions. This is almost the same patch that opoplawski suggested, except that I removed the test for ‘emacs-repository-version’, which isn’t defined in Emacs 24.3.
| * show help if protoc is called without any arguments, pre-empts -h and --help ↵Gravatar Dennis Cappendijk2017-05-22
|/ | | | to show a useful message instead of just 'Missing input file.'
* Merge pull request #3104 from thomasvl/ext_registry_copyGravatar Thomas Van Lenten2017-05-17
|\ | | | | Fix ExtensionRegistry copying and add tests.
| * Fix ExtensionRegistry copying and add tests.Gravatar Thomas Van Lenten2017-05-17
|/ | | | | | | | | - Fix up -copyWithZone: to not leave the two registries sharing some of the storage by using -addExtensions:. - Improve -addExtensions: to clone the sub dict when there is nothing to merge into. - A ExtensionRegistry unittests. - Update project schemes to not have extra things in perf scheme.
* Merge pull request #2815 from devwout/ruby_json_emit_defaultsGravatar Joshua Haberman2017-05-15
|\ | | | | Ruby version optionally emits default values in JSON encoding.
* \ Merge pull request #3062 from Oppen/masterGravatar Feng Xiao2017-05-08
|\ \ | | | | | | Workaround gcc < 4.5.0 bug
* | | Add compatibility test for php. (#3041)Gravatar Paul Yang2017-05-05
| | | | | | | | | | | | | | | | | | * Add compatibility test for php. * Revert API incompatible change.
| * | Workaround gcc < 4.5.0 bugGravatar Mario J. Rugiero2017-05-05
|/ / | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
* | Merge pull request #3043 from acozzette/javascriptGravatar Adam Cozzette2017-05-04
|\ \ | | | | | | Removed mention of Buffer in byteSourceToUint8Array
| * | Removed mention of Buffer in byteSourceToUint8ArrayGravatar Adam Cozzette2017-05-02
|/ / | | | | | | | | | | The Closure compiler complains about Buffer since that class exists only in Node. That logic does not seem to be needed (unit tests and conformance tests pass without it), so let's just remove it to solve the problem.
* | Merge pull request #2873 from myitcv/fix_1562Gravatar Adam Cozzette2017-05-02
|\ \ | | | | | | Javascript: use goog.crypt.byteArrayToString instead of String.fromCharCode.apply
| * | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵Gravatar Paul Jolly2017-05-02
|/ / | | | | | | String.fromCharCode.apply
* | Merge pull request #3024 from acozzette/merge-3.3-to-masterGravatar Adam Cozzette2017-05-01
|\ \ | | | | | | Merged 3.3.x branch to master
* | | added "objectivec" build target (#3033)Gravatar makdharma2017-05-01
| | | | | | | | | This target will be used by gRPC iOS bazel build system.
| * | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|/| |
* | | Merge pull request #3023 from acozzette/minGravatar Adam Cozzette2017-04-27
|\ \ \ | | | | | | | | Fully qualify min as std::min in wire_format_lite.cc
| * | | Fully qualify min as std::min in wire_format_lite.ccGravatar Adam Cozzette2017-04-27
|/ / /
| * | Add prefix to enum value with reserved name. (#3020)Gravatar Paul Yang2017-04-26
| | |
* | | Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \ \ | | | | | | | | Remove "using namespace std" from stubs/common.h
* \ \ \ Merge pull request #3015 from buchgr/unused-constsGravatar Feng Xiao2017-04-26
|\ \ \ \ | | | | | | | | | | Remove unused constants.
| | * | | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the contents of the std namespace from being effectively pulled into the top-level namespace in all translation units that include common.h. I left in individual using statements for a few common things like std::set and std::map, because it did not seem worth going through the churn of updating the whole codebase to fix those right now.
| | * | Add a test case for nested enum, which was missed previously. (#3010)Gravatar Paul Yang2017-04-25
| | | |
| * | | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ / / | | | | | | | | | | | | When compiling with -Werror, -Wunused-const-variable the build fails due to those two constants not being used.
* | | Merge pull request #3008 from postmasters/patch-1Gravatar Feng Xiao2017-04-24
|\ \ \ | | | | | | | | Add a link to dart-lang/protobuf
| | * | Add nested enum descriptor in php rumtime. (#3009)Gravatar Paul Yang2017-04-24
| | | |
| | * | Update php version number to 3.3.0 (#3001)Gravatar Paul Yang2017-04-24
| | | |
| * | | Add a link to dart-lang/protobufGravatar postmasters2017-04-24
|/ / /
| * | Throw exception when parsing invalid data. (#3000)Gravatar Paul Yang2017-04-21
| | |
| * | Merge pull request #2996 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-20
| |\ \ | | | | | | | | Fix python3 issue.
| * | | Allow proto files to import descriptor.proto (#2995)Gravatar Paul Yang2017-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files.
| | * | Fix python3 issue.Gravatar Feng Xiao2017-04-20
| |/ /
* | | Merge pull request #2992 from xiaogaozi/patch-1Gravatar Feng Xiao2017-04-20
|\ \ \ | | | | | | | | Add gogoprotobuf to third-party add-ons list
| * | | Add gogoprotobuf to third-party add-ons listGravatar Changjian Gao2017-04-20
|/ / /
| * | Prepend "PB" to generated classes whose name are reserved words. (#2990)Gravatar Paul Yang2017-04-20
| | |