aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-221-2/+3
| | | | * Migrate away from deprecated OSAtomic APIs.
* Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ | | | | Add more tests to time_test
| * Update time_test.ccAnton Fedorov2018-01-051-0/+53
| | | | | | Better test coverage for datetime validation.
* | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-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 masterJisi Liu2018-01-031-1/+1
|\
| * remove nullptrJisi Liu2018-01-021-1/+1
| |
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0321-156/+305
|\|
| * Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| |\ | | | | | | Add support for Windows ARM64 build
| | * Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | |
| * | Merge pull request #4072 from google/jieluoJisi Liu2017-12-194-51/+99
| |\ \ | | | | | | | | Cherrypick for csharp, including:
| | * | Cherrypick for csharp, including:Jie Luo2017-12-194-51/+99
| | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
| * | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| | |/ | |/|
| * | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
| |\ \ | | | | | | | | Replace C++11 only method std::map::at
| | * | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| | |/
| * / Update version number to 3.5.1Jisi Liu2017-12-1914-16/+16
| |/
| * Merge pull request #4040 from bazurbat/3.5.xAdam Cozzette2017-12-151-0/+1
| |\ | | | | | | Create containing directory before generating well_known_types_embed.cc
| | * Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-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_enumJisi Liu2017-12-131-9/+9
| |\ \ | | | | | | | | Use matching enum type for IsPOD.
| | * | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
| | | |
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-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 checkLaszlo Csomor2017-12-071-3/+3
| | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER.
| * | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| | |
| * | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-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 testsLaszlo Csomor2017-12-073-31/+89
| | |
| * | io_win32: support non-ASCII pathsLaszlo Csomor2017-12-073-89/+176
| | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951
| * | io_win32_unittest: make //:win32_test run againLaszlo Csomor2017-12-071-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/masterJisi Liu2017-12-201-0/+3
|\ \ | | | | | | Add support for Windows ARM64 build
| * | Add support for Windows ARM64 buildMiradham Kamilov2017-12-191-0/+3
| | |
* | | line breaks adjstedUbuntu2017-12-201-5/+12
| | |
* | | formatting issuesUbuntu2017-12-202-8/+11
| | |
* | | resolve issue 4032 and added a unit testUbuntu2017-12-192-1/+17
|/ /
* | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Adam Cozzette2017-12-141-1/+9
|\ \ | | | | | | Java: generate an annotation to suppress deprecation warnings
| * | Generate an annotation to suppress deprecation warningsAdam Cozzette2017-12-131-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/deprecateJisi Liu2017-12-142-5/+7
|\ \ \ | |/ / |/| | Add deprecation annotation for oneof case.
| * | Add deprecation annotation for oneof case.Jisi Liu2017-12-132-5/+7
| | |
* | | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-131-2/+4
| | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
* | | Merge pull request #4044 from xfxyjwf/issue3268Feng Xiao2017-12-1313-39/+39
|\ \ \ | | | | | | | | Avoid double underscores in macro name
| * | | Update generated code.Feng Xiao2017-12-1312-36/+36
| | | |
| * | | Avoid two consecutive underscores in macro name.Feng Xiao2017-12-131-3/+3
| | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3268
* | | | Merge pull request #4041 from acozzette/fix-license-issue-1775Adam Cozzette2017-12-132-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 testAdam Cozzette2017-12-132-1/+60
| | |/ / | |/| | | | | | | | | | This fixes issue #1775.
* | | | Add unknown field support for csharp (#3936)Jie Luo2017-12-131-37/+65
| |/ / |/| | | | | Add unknown field support for csharp
* | | Merge pull request #4037 from xfxyjwf/issue2880Feng Xiao2017-12-131-4/+4
|\ \ \ | |/ / |/| | Clarify default value behavior in JSON conversion.
| * | Clarify default value behavior in JSON conversion.Feng Xiao2017-12-121-4/+4
| | | | | | | | | | | | Make it clear default value is only omitted for proto3.
* | | Merge pull request #4036 from xfxyjwf/issue3093Feng Xiao2017-12-121-1/+3
|\ \ \ | | | | | | | | Update comments for Timestamp JSON format.
| * | | Update comments for Timestamp JSON format.Feng Xiao2017-12-121-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-ubJisi Liu2017-12-121-4/+5
|\ \ \ | |/ / |/| | fix undefined behavior in C++03
| * | use const char* instead of const std::string& in normalize()Jeffrey Quesnelle2017-12-071-5/+5
| | |
| * | fix undefined behavior in C++03Jeffrey Quesnelle2017-12-071-4/+5
| | |
* | | C# code generation changes to use bitwise comparisons for doublesJon Skeet2017-12-092-12/+30
| | |