aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | Remove ranged based for in io_win32.ccJisi Liu2017-09-271-2/+2
| | | | |
| * | | | Add spacesJisi Liu2017-09-271-1/+1
| | | | |
| * | | | Fix C++11 string accessorsJisi Liu2017-09-271-1/+1
| |/ / /
| * | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| | | |
| * | | Exclude valid constant name from reserved name.Bo Yang2017-09-121-2/+35
| | | |
| * | | Add prefix to php reserved keywords.Bo Yang2017-09-081-3/+21
| |/ /
| * / change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-303-137/+137
| |/ | | | | internal descriptor.proto
| * Make distcheck aware of test proto files.Jisi Liu2017-08-231-2/+8
| |
* | Use constexpr more with VC++ 2017 (#3707)Bruce Dawson2017-10-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | * Use constexpr more with VC++ 2017 Chrome's official builds have over 170 dynamic initializers for variables of the form *::TableStruct::aux. Defining PROTOBUF_CONSTEXPR_VAR to be constexpr for VS 2017 gets rid of all of these and saves about 10 KB of binary size. * Update generated_message_table_driven.h Restore accidentally deleted line.
* | Test Shutdown can be called multiple times.Jisi Liu2017-09-211-0/+2
| |
* | Integrated internal changes from GoogleAdam Cozzette2017-09-14118-12977/+11217
| |
* | Clang warning cleanup for unused parameter.drivehappy2017-09-131-1/+1
| |
* | Exclude addressbook.proto from C# boostrap test.Feng Xiao2017-09-111-5/+0
| | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target.
* | Merge pull request #3503 from gburgessiv/masterJisi Liu2017-08-241-1/+4
|\ \ | | | | | | Work around a bug in clang's static analyzer
| * | Work around a bug in clang's static analyzerGeorge Burgess IV2017-08-221-1/+4
| | | | | | | | | | | | | | | | | | | | | Due to https://bugs.llvm.org/show_bug.cgi?id=34198, clang's static analyzer emits diagnostics about leaking `container`. Doing this assignment in two steps works around this, and shouldn't cause these issues.
* | | Merge pull request #3548 from google/3.4.xJisi Liu2017-08-223-54/+17
|\ \ \ | | |/ | |/| Merge fixes from 3.4.x into master
| * | Disable death tests on windowsJisi Liu2017-08-222-39/+2
| | | | | | | | | | | | Also remove cord related code
| * | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Jisi Liu2017-08-222-29/+33
| |\ \ | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
| | * | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
| | | | | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
| |/ / | | | | | | Fixing -Wexpansion-to-defined Clang warning
| * | Fix compile errorsJisi Liu2017-08-211-3/+3
| | |
| * | Remove C++11 features in io_win32.ccJisi Liu2017-08-211-15/+15
| | | | | | | | | | | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back()
* | | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
|\ \ \ | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | Fixing unused parameter warnings under Clang.drivehappy2017-08-212-29/+33
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18179-7262/+12264
|\ \ \ | |/ / |/| / | |/
| * Fix cmath/math.h include with non C++11 libstdc++Jisi Liu2017-08-151-6/+11
| |
| * Merge pull request #3485 from pherl/mingwv3.4.0rc3Jisi Liu2017-08-1113-15/+44
| |\ | | | | | | Fix build on MinGW32
| | * Fix commentsJisi Liu2017-08-112-1/+2
| | |
| | * Add malloc castJisi Liu2017-08-111-2/+2
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 20:14:10 +0000