aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-2216-258/+258
| | | | | | This seems to be necessary to prevent warnings in some compiler configurations, particularly for tag numbers that are too large to fit in a signed 32-bit int.
* Add back missing LIBPROTOBUF_EXPORT.Feng Xiao2016-11-171-1/+1
|
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1717-171/+278
|\
| * Add LL to large constantzhsyourai2016-11-181-4/+4
| | | | | | Some compiler will report: 'error: integer constant is too large for long type'
| * Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-161-2/+16
| | | | | | | | In php, class name cannot be "Empty". Modified code generator to (#2375) generate GPBEmpty instead (for google.protobuf.Empty only). Also change runtime code to work with the new generated code accordingly.
| * Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccAdam Cozzette2016-11-161-0/+1
| |\ | | | | | | Add missing include in message_lite.cc
| | * Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
| | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
| * | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
| |/ | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99.
| * Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
| | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd.
| * Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
| |\ | | | | | | MessageOptions should handle both proto2 and google.protobuf package names.
| | * Made helper code also consider package name 'proto2' when dealing with ↵guptasu2016-11-103-10/+27
| | | | | | | | | | | | | | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
| * | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-103-115/+119
| |\ \ | | |/ | |/| Fixes deprecation warnings/errors on Xcode
| | * Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-101-111/+111
| | |
| | * Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the ↵Sergio Campama2016-11-072-4/+8
| | | | | | | | | | | | mac version to that if atomic is enabled
| * | 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
| | | | | | | | | | | | The size parameter is only used in cases where the compiler supports sized delete, so when that's not available we need to specifically cast it to void to prevent a warning.
| * 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 atomics
| | * [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsJulien Brianceau2016-10-281-0/+4
| | | | | | | | | | | | | | | | | | ARM specific CONFIG_KUSER_HELPERS feature can be disabled in Linux kernel, and in this case, we shouldn't crash. Use gcc built-in functions instead of arm specific code if they are available.
| * | Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchgJisi Liu2016-11-021-5/+5
| |\ \ | | | | | | | | generic atomicops: Use strong compare_exchange
| | * | generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
| | |/ | | | | | | | | | | | | Weak compare-and-exchange are allowed to fail spuriously, so we have to use the strong variation here.
| * / Fix compiler warnings when running :protobuf_testMichael Avrukin2016-11-021-4/+4
| |/ | | | | When running >bazel test :protobuf_test a few compiler warnings came up. They were centered around the usage of "int" as the loop counter where the value should have been a size_t.
| * 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.
| | | * 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 imports
| | | * | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-271-14/+16
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug was causing generated JSPB code with CommonJS-style imports to refer incorrectly to nested messages from other .proto files. The generated code would have things like "test_pb.InnerMessage" instead of "test_pb.OuterMessage.InnerMessage". This commit fixes the problem by correctly taking into account any message nesting.
| | * / Do strict enum name checking only for proto3Adam Cozzette2016-10-042-9/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | There seem to already be .proto files out there that have conflicting enum names, which will not be able to build successfully for some languages (like C#). To prevent this problem from spreading, let's make it an error for proto3 but just issue a warning for proto2. This fixes issue #2179.
| | * 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
| | | | | | | | | | | | Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
| | * Fix default instance destructorJisi Liu2016-09-2314-13/+112
| | |
| | * Bump library version to 11Bo Yang2016-09-221-2/+2
| | |
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | (#2146) Currently deserialization of a non-packed binary repeated field is quadratic in the number of elements, because each time we parse a new element we copy over all elements we have parsed so far. This CL fixes the performance problem by having the generated deserialization code just call addX() instead of using getX() and setX().
| | * Bump library veriosn to 3.1Bo Yang2016-09-2114-30/+30
| | |
| | * Fix bugs for internal integration.Bo Yang2016-09-201-1/+1
| | |
| | * Fix bugs for internal integration.Bo Yang2016-09-191-0/+1
| | |
| | * Integrate internal changesBo Yang2016-09-19153-5232/+9444
| | |
* | | Integrated internal changes from GoogleAdam Cozzette2016-11-17218-12630/+13000
|/ /
* | Do strict enum name checking only for proto3Adam Cozzette2016-10-102-9/+27
| | | | | | | | | | | | | | | | There seem to already be .proto files out there that have conflicting enum names, which will not be able to build successfully for some languages (like C#). To prevent this problem from spreading, let's make it an error for proto3 but just issue a warning for proto2. This fixes issue #2179.
* | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-10-101-14/+16
| | | | | | | | | | | | | | | | A bug was causing generated JSPB code with CommonJS-style imports to refer incorrectly to nested messages from other .proto files. The generated code would have things like "test_pb.InnerMessage" instead of "test_pb.OuterMessage.InnerMessage". This commit fixes the problem by correctly taking into account any message nesting.
* | 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
| | | | | | | | Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
* | Fix default instance destructorJisi Liu2016-10-1014-13/+112
| |