aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* remove nullptrJisi Liu2018-01-021-1/+1
|
* 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
* Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
|
* Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-083-130/+2
|\ | | | | Fix Atomic32/AtomicWord on some platforms.
| * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-083-130/+2
| | | | | | | | | | | | | | | | | | | | - 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.
* | Provide util funtions to figure out correct php class names. (#3850)Paul Yang2017-11-082-9/+36
|/
* Update generated descritpors.Jisi Liu2017-11-0212-24/+24
|
* Update version number to 3.5.0Jisi Liu2017-11-022-8/+8
|
* Fix merging with message-valued oneofJon Skeet2017-10-319-3/+30
| | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation.
* update joda-time javadoc urlxuwei-k2017-10-301-1/+1
|
* Reserve unknown in Ruby (#3763)Paul Yang2017-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown in ruby * Revert ruby tests. Wait for cpp impl for conformance test * Add conformance test for preserving unknown * Add unknown field conformance test to csharp failure list. * Fix comments * Fix comment * Fix comments * Fix typo * Use stringsink_string directly * Mark hd unused * Remove unused encodeunknown_handlerfunc
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-2/+5
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-181-2/+5
| |\ | | | | | | Add @Deprecated annotation support for proto file.
| | * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-311-2/+5
| | |
| * | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
| |\ \ | | | | | | | | Clang warning cleanup for unused parameter.
| | * | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
| | | |
| | * | Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-131-29/+5
| | | | | | | | | | | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b.
| | * | Fix js conformance tests. (#3604)Paul Yang2017-09-121-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests
* | | | Merge pull request #3743 from Schtolc/masterJisi Liu2017-10-191-3/+3
|\ \ \ \ | | | | | | | | | | CodedInputStream::SetTotalBytesLimit description fix
| * | | | CodedInputStream::SetTotalBytesLimit description fixPavel2017-10-121-3/+3
| | | | |
* | | | | Merge pull request #3754 from toanju/gcc-fallthroughJisi Liu2017-10-191-0/+2
|\ \ \ \ \ | | | | | | | | | | | | fix implicit fallthrough in gcc 7
| * | | | | fix implicit fallthrough in gcc 7Tobias Jungel2017-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | fixes #3700
* | | | | | Fix Java 1.6 compileJisi Liu2017-10-181-2/+2
| | | | | |
* | | | | | Fix bazel buildJisi Liu2017-10-181-4/+2
| | | | | |
* | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2017-10-181-13/+21
|\ \ \ \ \ \
| * | | | | | Fix unsiged underflowJisi Liu2017-10-181-1/+1
| | | | | | |
| * | | | | | Remove C++11 only usages in io_win32 tests.Jisi Liu2017-10-181-13/+21
| | | | | | |
* | | | | | | Merge from google internalJisi Liu2017-10-1875-2889/+3302
|/ / / / / /
* / / / / / Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-164-10/+16
|/ / / / / | | | | | | | | | | | | | | | See https://github.com/google/protobuf/issues/3752 for context.
* | | | | Move namespace closing brace inside the header guard blockFrancois Marier2017-10-121-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-113-9/+65
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3690 from pherl/3.4.xJisi Liu2017-10-021-2/+2
| |\ \ \ | | | | | | | | | | Remove ranged based for in io_win32.cc
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 10:12:31 +0000