aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-102-112/+112
|
* 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
* Merge pull request #2329 from acozzette/unused-parameterAdam Cozzette2016-11-041-0/+1
|\ | | | | Fix unused parameter warnings in arena_free
| * 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 #2330 from manupsunny/masterJisi Liu2016-11-042-2/+2
|\ \ | |/ |/| Fix message for InvalidProtocolBufferException
| * Fix message for InvalidProtocolBufferExceptionMsp2016-11-042-2/+2
|/
* 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.
* | Update conformance test failure listJon Skeet2016-11-031-4/+0
| |
* | Change JSON field name formattingJon Skeet2016-11-034-85/+23
| | | | | | | | | | | | | | | | | | This affects cases with leading capital letters. This breaks compatibility with previous C# releases, but fixes compatibility with other implementations. See #2278 for details.
* | 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.
* | Merge pull request #2318 from mavrukin/patch-1Feng Xiao2016-11-021-4/+4
|\ \ | | | | | | Fix compiler warnings when running :protobuf_test
| * | 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.
* | Merge pull request #2307 from sinzianag/swift_protobufFeng Xiao2016-10-311-0/+1
|\ \ | | | | | | Docs: Link to Apple's Swift plugin and runtime for protobufs
| * | Adding Apple's Swift ProtobufSinziana Gafitanu2016-10-301-0/+1
| | |
* | | Merge pull request #2309 from thomasvl/note_about_coding_supportThomas Van Lenten2016-10-311-1/+10
|\ \ \ | |_|/ |/| | Add note about extension use and Coding support.
| * | Add note about extension use and Coding support.Thomas Van Lenten2016-10-311-1/+10
|/ /
* | Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297)Sergio Campamá2016-10-272-0/+29
| | | | | | | | Adds pushLimit: and popLimit: into GPBCodedInputStream
* | Trigger update of docker for new changes in #2282. (#2288)Paul Yang2016-10-272-0/+2
| |
* | Merge pull request #2290 from ramrunner/OpenBSDsupportFeng Xiao2016-10-261-2/+2
|\ \ | | | | | | define no_threadlocal on OpenBSD
| * | define no_threadlocal on OpenBSDramrunner2016-10-261-2/+2
|/ /
* | Merge pull request #2284 from pherl/plugin_optJisi Liu2016-10-263-17/+93
|\ \ | | | | | | Support extra parameters for plugins.
| * | Add comments about converting directives into PluginNameJisi Liu2016-10-261-1/+2
| | |
| * | Support extra parameters for plugins.Jisi Liu2016-10-253-16/+91
| |/
* / Fix pure php implementation for 32-bit machine. (#2282)Paul Yang2016-10-2517-392/+545
|/
* Merge pull request #2274 from nmittler/gaeFeng Xiao2016-10-201-5/+45
|\ | | | | Hacking ByteBufferWriter to work with GAE
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
|/ | | | Fixes #2269
* Merge pull request #2264 from rshin/masterFeng Xiao2016-10-192-4/+8
|\ | | | | Place Python extensions correctly in Bazel build.
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
| |
| * Place Python extensions correctly in Bazel build.Richard Shin2016-10-181-4/+4
|/
* Merge pull request #2254 from JasonLunn/patch-1Feng Xiao2016-10-161-0/+2
|\ | | | | Use git clean before installing via bundler
| * Use git clean before installing via bundlerJason Lunn2016-10-141-0/+2
|/
* Merge pull request #1959 from abergmeier-dsfishlabs/feature/cppFeng Xiao2016-10-131-7/+17
|\ | | | | Need to expose generated protobuf C++ headers
| * Need to expose generated protobuf C++ headers so they can actually be ↵Andreas Bergmeier2016-08-151-7/+17
| | | | | | | | accessed from other libraries.
* | Merge pull request #2251 from TeBoring/masterPaul Yang2016-10-137-32/+84
|\ \ | | | | | | Merge 3.1.x branch into master.
| * | Merge 3.1.x into master.Bo Yang2016-10-137-32/+84
|/| |
| * | Fix the bug that message without namespace is not found in the descriptor ↵Paul Yang2016-10-116-23/+83
| | | | | | | | | | | | pool. (#2240)
| * | 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
| | | |
| * | | Fix python_cpp test on Mac. Link staticly when building extension, so that ↵Paul Yang2016-10-072-2/+3
| | | | | | | | | | | | | | | | the extension doesn't require installing protobuf library. (#2232)
| * | | Add csharp/build_tools.sh for dist check.Bo Yang2016-10-061-0/+1
| | | |
| * | | Fix compile error for php on Mac.Bo Yang2016-10-0511-39/+55
| | | |
| * | | Fix segmentation fault when ZTS is defined.Bo Yang2016-10-055-34/+39
| | | |
| * | | PHP: fix ZTS tsrm_ls errors (#2189)Stanley Cheung2016-10-046-59/+69
| | | | | | | | | | | | | | | | | | | | | | | | * PHP: fix ZTS tsrm_ls errors * Fix a few more macros
| * | | Merge pull request #2193 from acozzette/common-js-fixAdam Cozzette2016-10-044-14/+44
| |\ \ \ | | | | | | | | | | Fixed references to foreign nested messages with CommonJS-style imports
| | * | | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-274-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add test for php zts build.Bo Yang2016-10-041-4/+16
| | | | |
| * | | | Prepare jenkins for testing php zts build.Bo Yang2016-10-041-0/+6
| | | | |
| * | | | Merge pull request #2204 from acozzette/enum-namesAdam Cozzette2016-10-042-9/+27
| |\ \ \ \ | | | | | | | | | | | | Do strict enum name checking only for proto3