aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge pull request #4000 from Kwizatz/masterAdam Cozzette2017-12-081-2/+2
|\ \ | | | | | | Using binary one's complement to negate an unsigned int
| * | Using binary one's complement to negate an unsigned intRodrigo Hernandez2017-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned.
* | | Use the portable version of Log2Floor for Clang with older Android NDK versionsAdam Cozzette2017-12-071-4/+12
| |/ |/| | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl.
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-0135-433/+100
|\|
| * Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-3031-200/+92
| |\
| | * 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
| | |
| * | Merge pull request #3955 from linux-on-ibm-z/masterFeng Xiao2017-11-301-0/+8
| |\ \ | | | | | | | | Adding Release_CompareAndSwap 64-bit variant
| | * | Adding Release_CompareAndSwap 64-bit variantNayana-ibm2017-11-271-0/+8
| | | |
| * | | Added back in LIBPROTOC_EXPORT which was removed by mistakeAdam Cozzette2017-11-281-1/+1
| |/ /
| * / Move C#-only test protos to csharp/protosJon Skeet2017-11-124-233/+0
| |/ | | | | | | | | | | | | | | | | | | 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#.
* / Integrated internal changes from GoogleAdam Cozzette2017-12-01100-2750/+3514
|/
* 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