Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json | Feng Xiao | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix csharp/src/Google.Protobuf.Test/project.json | |||||
| * | | | | | | Fix csharp/src/Google.Protobuf.Test/project.json | Julien Brianceau | 2016-11-14 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the following Chromium presubmit error: third_party/protobuf/csharp/src/Google.Protobuf.Test/project.json could not be parsed: Expecting property name: line 25 column 3 (char 482) | |||||
* | | | | | | Merge pull request #2364 from haberman/jslicense | Joshua Haberman | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fixed JavaScript license declaration. | |||||
| * | | | | | Fixed JavaScript license declaration. | Josh Haberman | 2016-11-14 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2358 from ckennelly/master | Feng Xiao | 2016-11-11 | 1 | -15/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Resolve old TODO for StringTypeHandler. | |||||
| * | | | | | Resolve old TODO for StringTypeHandler. | Chris Kennelly | 2016-11-11 | 1 | -15/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd. | |||||
* | | | | | Merge pull request #2353 from guptasu/master | Feng Xiao | 2016-11-11 | 3 | -10/+27 | |
|\ \ \ \ \ | | | | | | | | | | | | | MessageOptions should handle both proto2 and google.protobuf package names. | |||||
| * | | | | | Made helper code also consider package name 'proto2' when dealing with ↵ | guptasu | 2016-11-10 | 3 | -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 #2357 from D3Hunter/master | Feng Xiao | 2016-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | #2356 : fix ExceptionInInitializerError on IBM J9 | |||||
| * | | | | | | #2356 : fix ExceptionInInitializerError on IBM J9 | Time | 2016-11-11 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Fix php c extension on 32-bit machines. (#2348) | Paul Yang | 2016-11-10 | 7 | -17/+187 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2337 from sergiocampama/deprecation | Feng Xiao | 2016-11-10 | 4 | -116/+120 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fixes deprecation warnings/errors on Xcode | |||||
| * | | | | | Fixing references to the removed atomicops_internals_pnacl.h file. | Sergio Campama | 2016-11-10 | 2 | -112/+112 | |
| | | | | | | ||||||
| * | | | | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the ↵ | Sergio Campama | 2016-11-07 | 2 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | mac version to that if atomic is enabled | |||||
* | | | | | | Merge pull request #2332 from Kwizatz/master | Adam Cozzette | 2016-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added explicit cast to avoid size warning on Win64. | |||||
| * | | | | | | Added explicit cast to avoid size warning on Win64. | Rodrigo Hernandez | 2016-11-04 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2327 from ctubbsii/fix-maven-compiler-plugin | Adam Cozzette | 2016-11-09 | 5 | -14/+77 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use latest maven-compiler-plugin (2.6.0) | |||||
| * | | | | | | Use latest maven-compiler-plugin (2.6.0) | Christopher Tubbs | 2016-11-04 | 5 | -14/+77 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Uses build-helper-maven-plugin to add generated sources to the classpath * Fixes an issue building with newer versions of the maven-compiler-plugin (See https://issues.apache.org/jira/browse/MCOMPILER-240) | |||||
* | | | | | | | Implement RepeatedFieldIter for c extension. (#2333) | Paul Yang | 2016-11-08 | 5 | -3/+155 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2329 from acozzette/unused-parameter | Adam Cozzette | 2016-11-04 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix unused parameter warnings in arena_free | |||||
| * | | | | | | Fix unused parameter warnings in arena_free | Adam Cozzette | 2016-11-04 | 1 | -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/master | Jisi Liu | 2016-11-04 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix message for InvalidProtocolBufferException | |||||
| * | | | | | Fix message for InvalidProtocolBufferException | Msp | 2016-11-04 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2 | Feng Xiao | 2016-11-03 | 1 | -0/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | [arm/gcc] Don't rely on KUSER_HELPERS feature for atomics | |||||
| * | | | | | [arm/gcc] Don't rely on KUSER_HELPERS feature for atomics | Julien Brianceau | 2016-10-28 | 1 | -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 list | Jon Skeet | 2016-11-03 | 1 | -4/+0 | |
| | | | | | | ||||||
* | | | | | | Change JSON field name formatting | Jon Skeet | 2016-11-03 | 4 | -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-cmpxchg | Jisi Liu | 2016-11-02 | 1 | -5/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | generic atomicops: Use strong compare_exchange | |||||
| * | | | | | generic atomicops: Use strong compare_exchange | Julien Brianceau | 2016-10-28 | 1 | -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-1 | Feng Xiao | 2016-11-02 | 1 | -4/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix compiler warnings when running :protobuf_test | |||||
| * | | | | | Fix compiler warnings when running :protobuf_test | Michael Avrukin | 2016-11-02 | 1 | -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_protobuf | Feng Xiao | 2016-10-31 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Docs: Link to Apple's Swift plugin and runtime for protobufs | |||||
| * | | | | | Adding Apple's Swift Protobuf | Sinziana Gafitanu | 2016-10-30 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #2309 from thomasvl/note_about_coding_support | Thomas Van Lenten | 2016-10-31 | 1 | -1/+10 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add note about extension use and Coding support. | |||||
| * | | | | | Add note about extension use and Coding support. | Thomas Van Lenten | 2016-10-31 | 1 | -1/+10 | |
|/ / / / / | ||||||
* | | | | | Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297) | Sergio Campamá | 2016-10-27 | 2 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | Adds pushLimit: and popLimit: into GPBCodedInputStream | |||||
* | | | | | Trigger update of docker for new changes in #2282. (#2288) | Paul Yang | 2016-10-27 | 2 | -0/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #2290 from ramrunner/OpenBSDsupport | Feng Xiao | 2016-10-26 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | define no_threadlocal on OpenBSD | |||||
| * | | | | define no_threadlocal on OpenBSD | ramrunner | 2016-10-26 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #2284 from pherl/plugin_opt | Jisi Liu | 2016-10-26 | 3 | -17/+93 | |
|\ \ \ \ | | | | | | | | | | | Support extra parameters for plugins. | |||||
| * | | | | Add comments about converting directives into PluginName | Jisi Liu | 2016-10-26 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Support extra parameters for plugins. | Jisi Liu | 2016-10-25 | 3 | -16/+91 | |
| |/ / / | ||||||
* / / / | Fix pure php implementation for 32-bit machine. (#2282) | Paul Yang | 2016-10-25 | 17 | -392/+545 | |
|/ / / | ||||||
* | | | Merge pull request #2274 from nmittler/gae | Feng Xiao | 2016-10-20 | 1 | -5/+45 | |
|\ \ \ | | | | | | | | | Hacking ByteBufferWriter to work with GAE | |||||
| * | | | Hacking ByteBufferWriter to work with GAE | nmittler | 2016-10-20 | 1 | -5/+45 | |
|/ / / | | | | | | | | | | Fixes #2269 | |||||
* | | | Merge pull request #2264 from rshin/master | Feng Xiao | 2016-10-19 | 2 | -4/+8 | |
|\ \ \ | | | | | | | | | Place Python extensions correctly in Bazel build. | |||||
| * | | | Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS | Richard Shin | 2016-10-19 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Place Python extensions correctly in Bazel build. | Richard Shin | 2016-10-18 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #2254 from JasonLunn/patch-1 | Feng Xiao | 2016-10-16 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Use git clean before installing via bundler | |||||
| * | | | Use git clean before installing via bundler | Jason Lunn | 2016-10-14 | 1 | -0/+2 | |
|/ / / |