Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Migrate away from deprecated OSAtomic APIs. (#4184) | Jonathan Dierksen | 2018-01-22 | 1 | -2/+3 |
| | | | | * Migrate away from deprecated OSAtomic APIs. | ||||
* | Merge pull request #4148 from datacompboy/patch-2 | Adam Cozzette | 2018-01-08 | 1 | -0/+53 |
|\ | | | | | Add more tests to time_test | ||||
| * | Update time_test.cc | Anton Fedorov | 2018-01-05 | 1 | -0/+53 |
| | | | | | | Better test coverage for datetime validation. | ||||
* | | Fix ValidateDateTime: check day instead month | Anton Fedorov | 2018-01-05 | 1 | -2/+2 |
|/ | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/ | ||||
* | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
|\ | |||||
| * | remove nullptr | Jisi Liu | 2018-01-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 21 | -156/+305 |
|\| | |||||
| * | Merge pull request #4080 from pherl/arm64 | Jisi Liu | 2017-12-20 | 1 | -0/+3 |
| |\ | | | | | | | Add support for Windows ARM64 build | ||||
| | * | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 4 | -51/+99 |
| |\ \ | | | | | | | | | Cherrypick for csharp, including: | ||||
| | * | | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 4 | -51/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files | ||||
| * | | | Fix string::back() usage in googletest.cc | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #4074 from pherl/mapat | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Replace C++11 only method std::map::at | ||||
| | * | | Replace C++11 only method std::map::at | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |/ | |||||
| * / | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 14 | -16/+16 |
| |/ | |||||
| * | Merge pull request #4040 from bazurbat/3.5.x | Adam Cozzette | 2017-12-15 | 1 | -0/+1 |
| |\ | | | | | | | Create containing directory before generating well_known_types_embed.cc | ||||
| | * | Create containing directory before generating well_known_types_embed.cc | Oleg Kolosov | 2017-12-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following build error: oldpwd=`pwd` && cd .../protobuf/src && \ $oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc /bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed which is observed during the cross-compilation since the version 3.2. | ||||
| * | | Merge pull request #4042 from pherl/cpp_enum | Jisi Liu | 2017-12-13 | 1 | -9/+9 |
| |\ \ | | | | | | | | | Use matching enum type for IsPOD. | ||||
| | * | | Use matching enum type for IsPOD. | Jisi Liu | 2017-12-13 | 1 | -9/+9 |
| | | | | |||||
| * | | | Explicitly propagate the status of Flush(). | Jisi Liu | 2017-12-13 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | Before the change, an implicit Flush() will be triggered in the destructor of the input stream. However, the return code of Flush() is not discarded. This change makes sure when Flush() fails, we will return false. | ||||
| * | | io_win32_unittest: remove incorrect error check | Laszlo Csomor | 2017-12-07 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER. | ||||
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8 | Laszlo Csomor | 2017-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | io_win32_unittest: use CWD as last tempdir | Laszlo Csomor | 2017-12-07 | 1 | -3/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the test cannot find a temp directory by checking environment variables, it will fall back to using the current working directory as the temp directory root. This is what the test used to do as of commit https://github.com/google/protobuf/commit/6de51caed52d798815954646b230c5aef3e4d2fc and what was then changed by commit https://github.com/google/protobuf/pull/3978/commits/792d098769d8e000d8d474c8ffd201d2eabc2134 | ||||
| * | | io_win32: add more encoding-related tests | Laszlo Csomor | 2017-12-07 | 3 | -31/+89 |
| | | | |||||
| * | | io_win32: support non-ASCII paths | Laszlo Csomor | 2017-12-07 | 3 | -89/+176 |
| | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951 | ||||
| * | | io_win32_unittest: make //:win32_test run again | Laszlo Csomor | 2017-12-07 | 1 | -49/+29 |
| |/ | | | | | | | | | | | | | | | | | Do not use "googletest.h", apprently that leads to linking errors on Windows which I couldn't figure out how to solve, and decided to just go with plain gTest instead. See https://github.com/google/protobuf/issues/3951 | ||||
* | | Merge pull request #4077 from mkamilov/master | Jisi Liu | 2017-12-20 | 1 | -0/+3 |
|\ \ | | | | | | | Add support for Windows ARM64 build | ||||
| * | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-19 | 1 | -0/+3 |
| | | | |||||
* | | | line breaks adjsted | Ubuntu | 2017-12-20 | 1 | -5/+12 |
| | | | |||||
* | | | formatting issues | Ubuntu | 2017-12-20 | 2 | -8/+11 |
| | | | |||||
* | | | resolve issue 4032 and added a unit test | Ubuntu | 2017-12-19 | 2 | -1/+17 |
|/ / | |||||
* | | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054 | Adam Cozzette | 2017-12-14 | 1 | -1/+9 |
|\ \ | | | | | | | Java: generate an annotation to suppress deprecation warnings | ||||
| * | | Generate an annotation to suppress deprecation warnings | Adam Cozzette | 2017-12-13 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | The valueOf method on enums is deprecated, but for compatibility reasons the generated code has to keep using it. We can use an annotation to suppress the deprecation warnings. | ||||
* | | | Merge pull request #4045 from pherl/deprecate | Jisi Liu | 2017-12-14 | 2 | -5/+7 |
|\ \ \ | |/ / |/| | | Add deprecation annotation for oneof case. | ||||
| * | | Add deprecation annotation for oneof case. | Jisi Liu | 2017-12-13 | 2 | -5/+7 |
| | | | |||||
* | | | Add auto-generated header to C# generated files (#4038) | Jan Tattermusch | 2017-12-13 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos | ||||
* | | | Merge pull request #4044 from xfxyjwf/issue3268 | Feng Xiao | 2017-12-13 | 13 | -39/+39 |
|\ \ \ | | | | | | | | | Avoid double underscores in macro name | ||||
| * | | | Update generated code. | Feng Xiao | 2017-12-13 | 12 | -36/+36 |
| | | | | |||||
| * | | | Avoid two consecutive underscores in macro name. | Feng Xiao | 2017-12-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3268 | ||||
* | | | | Merge pull request #4041 from acozzette/fix-license-issue-1775 | Adam Cozzette | 2017-12-13 | 2 | -1/+60 |
|\ \ \ \ | | | | | | | | | | | Added our standard license header to structurally_valid.cc and its test | ||||
| * | | | | Added our standard license header to structurally_valid.cc and its test | Adam Cozzette | 2017-12-13 | 2 | -1/+60 |
| | |/ / | |/| | | | | | | | | | | This fixes issue #1775. | ||||
* | | | | Add unknown field support for csharp (#3936) | Jie Luo | 2017-12-13 | 1 | -37/+65 |
| |/ / |/| | | | | | Add unknown field support for csharp | ||||
* | | | Merge pull request #4037 from xfxyjwf/issue2880 | Feng Xiao | 2017-12-13 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Clarify default value behavior in JSON conversion. | ||||
| * | | Clarify default value behavior in JSON conversion. | Feng Xiao | 2017-12-12 | 1 | -4/+4 |
| | | | | | | | | | | | | Make it clear default value is only omitted for proto3. | ||||
* | | | Merge pull request #4036 from xfxyjwf/issue3093 | Feng Xiao | 2017-12-12 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Update comments for Timestamp JSON format. | ||||
| * | | | Update comments for Timestamp JSON format. | Feng Xiao | 2017-12-12 | 1 | -1/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093 | ||||
* | | | Merge pull request #4016 from jquesnelle/string-access-ub | Jisi Liu | 2017-12-12 | 1 | -4/+5 |
|\ \ \ | |/ / |/| | | fix undefined behavior in C++03 | ||||
| * | | use const char* instead of const std::string& in normalize() | Jeffrey Quesnelle | 2017-12-07 | 1 | -5/+5 |
| | | | |||||
| * | | fix undefined behavior in C++03 | Jeffrey Quesnelle | 2017-12-07 | 1 | -4/+5 |
| | | | |||||
* | | | C# code generation changes to use bitwise comparisons for doubles | Jon Skeet | 2017-12-09 | 2 | -12/+30 |
| | | |