aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
...
| | * | | Merge pull request #4074 from pherl/mapatGravatar Jisi Liu2017-12-19
| | |\ \ \ | | | | | | | | | | | | Replace C++11 only method std::map::at
| | | * | | Replace C++11 only method std::map::atGravatar Jisi Liu2017-12-19
| | | |/ /
| | * / / Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
| | |/ /
* | | | resolve issue 4032 and added a unit testGravatar Ubuntu2017-12-19
| | | |
| * | | Add support for Windows ARM64 buildGravatar Miradham Kamilov2017-12-19
|/ / /
| * | Merge pull request #4040 from bazurbat/3.5.xGravatar Adam Cozzette2017-12-15
| |\ \ | | | | | | | | Create containing directory before generating well_known_types_embed.cc
* | \ \ Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Gravatar Adam Cozzette2017-12-14
|\ \ \ \ | | | | | | | | | | Java: generate an annotation to suppress deprecation warnings
* \ \ \ \ Merge pull request #4045 from pherl/deprecateGravatar Jisi Liu2017-12-14
|\ \ \ \ \ | | | | | | | | | | | | Add deprecation annotation for oneof case.
| | * | | | Generate an annotation to suppress deprecation warningsGravatar Adam Cozzette2017-12-13
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Add auto-generated header to C# generated files (#4038)Gravatar Jan Tattermusch2017-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
* | | | | Merge pull request #4044 from xfxyjwf/issue3268Gravatar Feng Xiao2017-12-13
|\ \ \ \ \ | | | | | | | | | | | | Avoid double underscores in macro name
* \ \ \ \ \ Merge pull request #4041 from acozzette/fix-license-issue-1775Gravatar Adam Cozzette2017-12-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added our standard license header to structurally_valid.cc and its test
| | | * | | | Add deprecation annotation for oneof case.Gravatar Jisi Liu2017-12-13
| | | | | | |
| | * | | | | Update generated code.Gravatar Feng Xiao2017-12-13
| | | | | | |
* | | | | | | Add unknown field support for csharp (#3936)Gravatar Jie Luo2017-12-13
| | | | | | | | | | | | | | | | | | | | | Add unknown field support for csharp
| | * | | | | Avoid two consecutive underscores in macro name.Gravatar Feng Xiao2017-12-13
| |/ / / / / |/| | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3268
| | | * | | Merge pull request #4042 from pherl/cpp_enumGravatar Jisi Liu2017-12-13
| | | |\ \ \ | | | | | | | | | | | | | | Use matching enum type for IsPOD.
* | | | \ \ \ Merge pull request #4037 from xfxyjwf/issue2880Gravatar Feng Xiao2017-12-13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Clarify default value behavior in JSON conversion.
| | | * | | | Explicitly propagate the status of Flush().Gravatar Jisi Liu2017-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * | | Use matching enum type for IsPOD.Gravatar Jisi Liu2017-12-13
| | | | | | |
| | * | | | | Added our standard license header to structurally_valid.cc and its testGravatar Adam Cozzette2017-12-13
| |/ / / / / |/| | | | | | | | | | | | | | | | | This fixes issue #1775.
| | | | * | Create containing directory before generating well_known_types_embed.ccGravatar Oleg Kolosov2017-12-13
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #4036 from xfxyjwf/issue3093Gravatar Feng Xiao2017-12-12
|\ \ \ \ \ | | | | | | | | | | | | Update comments for Timestamp JSON format.
* \ \ \ \ \ Merge pull request #4016 from jquesnelle/string-access-ubGravatar Jisi Liu2017-12-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix undefined behavior in C++03
| | | * | | | Clarify default value behavior in JSON conversion.Gravatar Feng Xiao2017-12-12
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Make it clear default value is only omitted for proto3.
| | * | | | Update comments for Timestamp JSON format.Gravatar Feng Xiao2017-12-12
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093
* | | | | C# code generation changes to use bitwise comparisons for doublesGravatar Jon Skeet2017-12-09
| | | | |
* | | | | Merge pull request #4000 from Kwizatz/masterGravatar Adam Cozzette2017-12-08
|\ \ \ \ \ | | | | | | | | | | | | Using binary one's complement to negate an unsigned int
| | * | | | use const char* instead of const std::string& in normalize()Gravatar Jeffrey Quesnelle2017-12-07
| | | | | |
* | | | | | Use the portable version of Log2Floor for Clang with older Android NDK versionsGravatar Adam Cozzette2017-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl.
| | * | | | fix undefined behavior in C++03Gravatar Jeffrey Quesnelle2017-12-07
| |/ / / / |/| | | |
| * | | | Using binary one's complement to negate an unsigned intGravatar Rodrigo Hernandez2017-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned.
| | * | | io_win32_unittest: remove incorrect error checkGravatar Laszlo Csomor2017-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER.
| | * | | io_win32_unittest: fix condition in GetCwdAsUtf8Gravatar Laszlo Csomor2017-12-07
| | | | |
| | * | | io_win32_unittest: use CWD as last tempdirGravatar Laszlo Csomor2017-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 testsGravatar Laszlo Csomor2017-12-07
| | | | |
| | * | | io_win32: support non-ASCII pathsGravatar Laszlo Csomor2017-12-07
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951
| | * | | io_win32_unittest: make //:win32_test run againGravatar Laszlo Csomor2017-12-07
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\| | |
* | | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| | | |
| * | | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\| |
| * | | Merge pull request #3955 from linux-on-ibm-z/masterGravatar Feng Xiao2017-11-30
| |\ \ \ | | | | | | | | | | Adding Release_CompareAndSwap 64-bit variant
| * | | | Added back in LIBPROTOC_EXPORT which was removed by mistakeGravatar Adam Cozzette2017-11-28
| | | | |
| | * | | Adding Release_CompareAndSwap 64-bit variantGravatar Nayana-ibm2017-11-27
| |/ / /
| * / / Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
| * | Support win32 long path for cross compiled buildGravatar Jisi Liu2017-11-10
| | |
| * | Merge pull request #3854 from pherl/3.5.xGravatar Jisi Liu2017-11-08
| |\ \ | | | | | | | | Fix Atomic32/AtomicWord on some platforms.
| * | | Provide util funtions to figure out correct php class names. (#3850)Gravatar Paul Yang2017-11-08
| | | |
| | * | Fix Atomic32/AtomicWord on some platforms.Gravatar Jisi Liu2017-11-08
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms.
| * | Update generated descritpors.Gravatar Jisi Liu2017-11-02
| | |