aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1716-59/+166
|\
| * Add LL to large constantzhsyourai2016-11-181-4/+4
| * Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-161-2/+16
| * Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccAdam Cozzette2016-11-161-0/+1
| |\
| | * Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
| * | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
| |/
| * Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
| * Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
| |\
| | * Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
| * | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-102-4/+8
| |\ \ | | |/ | |/|
| | * Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac...Sergio Campama2016-11-072-4/+8
| * | Added explicit cast to avoid size warning on Win64.Rodrigo Hernandez2016-11-041-1/+1
| |/
| * Fix unused parameter warnings in arena_freeAdam Cozzette2016-11-041-0/+1
| * Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2Feng Xiao2016-11-031-0/+4
| |\
| | * [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsJulien Brianceau2016-10-281-0/+4
| * | Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchgJisi Liu2016-11-021-5/+5
| |\ \
| | * | generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
| | |/
| * / Fix compiler warnings when running :protobuf_testMichael Avrukin2016-11-021-4/+4
| |/
| * define no_threadlocal on OpenBSDramrunner2016-10-261-2/+2
| * Add comments about converting directives into PluginNameJisi Liu2016-10-261-1/+2
| * Support extra parameters for plugins.Jisi Liu2016-10-253-16/+91
| * Merge 3.1.x into master.Bo Yang2016-10-131-9/+1
| |\
| | * Merge pull request #2203 from mrry/msvc_fixFeng Xiao2016-10-111-9/+1
| | |\
| | | * Fix MSVC build when HAVE_LONG_LONG is defined.Derek Murray2016-09-291-9/+1
| | * | Merge pull request #2193 from acozzette/common-js-fixAdam Cozzette2016-10-041-14/+16
| | |\ \
| | | * | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-271-14/+16
| | | |/
| | * / Do strict enum name checking only for proto3Adam Cozzette2016-10-042-9/+27
| | |/
| | * Fix MSVC stack overflow issue.Feng Xiao2016-09-231-0/+5
| | * Fix VS test failures.Feng Xiao2016-09-232-6/+24
| | * Reduce test length to avoid stack overflow on VS.Feng Xiao2016-09-231-3/+3
| | * Fix Visual Studio compile issues.Feng Xiao2016-09-2328-462/+748
| | * Fix default instance destructorJisi Liu2016-09-2314-13/+112
| | * Add back removed descriptor field.Bo Yang2016-09-223-137/+230
| | * Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) (...Adam Cozzette2016-09-211-7/+3
| | * Bump library veriosn to 3.1Bo Yang2016-09-2113-29/+29
| | * Fix bugs for internal integration.Bo Yang2016-09-201-1/+1
| | * Integrate internal changesBo Yang2016-09-19152-5232/+9438
* | | Integrated internal changes from GoogleAdam Cozzette2016-11-17217-12630/+12998
|/ /
* | Do strict enum name checking only for proto3Adam Cozzette2016-10-102-9/+27
* | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-10-101-14/+16
* | Fix MSVC stack overflow issue.Feng Xiao2016-10-101-0/+5
* | Fix VS test failures.Feng Xiao2016-10-102-6/+24
* | Reduce test length to avoid stack overflow on VS.Feng Xiao2016-10-101-3/+3
* | Fix Visual Studio compile issues.Feng Xiao2016-10-1028-462/+748
* | Fix default instance destructorJisi Liu2016-10-1014-13/+112
* | Add back removed descriptor field.Bo Yang2016-10-103-137/+230
* | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) (...Adam Cozzette2016-10-101-7/+3
* | Bump library veriosn to 3.1Bo Yang2016-10-1013-29/+29
* | Fix bugs for internal integration.Bo Yang2016-10-101-1/+1
* | Integrate internal changesBo Yang2016-10-10152-5232/+9430