Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2362 from wujingchao/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -2/+2 |
|\ | | | | | Class is final but declares protected field | ||||
| * | Class is final but declares protected field | wujingchao | 2016-11-14 | 1 | -2/+2 |
| | | | | | | This class is declared to be final, but declares fields to be protected. Since the class is final, it can not be derived from, and the use of protected is confusing. | ||||
* | | Merge pull request #2378 from ianfhunter/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -1/+1 |
|\ \ | | | | | | | typo in readme | ||||
| * | | typo | Ian Hunter | 2016-11-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc | Adam Cozzette | 2016-11-16 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Add missing include in message_lite.cc | ||||
| * | | Add missing include in message_lite.cc | Julien Brianceau | 2016-11-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error. | ||||
* | | | Fix jenkins tests. | Feng Xiao | 2016-11-15 | 2 | -1/+5 |
| | | | |||||
* | | | Merge pull request #2323 from marcinwyszynski/master | Joshua Haberman | 2016-11-15 | 2 | -0/+54 |
|\ \ \ | | | | | | | | | More Ruby-eqsue interface | ||||
| * | | | Move variable declarations before actual code | Marcin Wyszynski | 2016-11-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix copy pasta in test | Marcin Wyszynski | 2016-11-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | More Ruby-eqsue interface | Marcin Wyszynski | 2016-11-03 | 2 | -0/+54 |
| | | | | |||||
* | | | | Merge pull request #1907 from evokly/js-utf8-fix | Joshua Haberman | 2016-11-15 | 3 | -18/+71 |
|\ \ \ \ | | | | | | | | | | | JS: Fix for high utf-8 codepoints. | ||||
| * | | | | JS: Well, this is the right place for surrogates. | Wojciech Mandrysz | 2016-11-15 | 1 | -9/+11 |
| | | | | | |||||
| * | | | | JS: Re-added comment, moved surrogates code to the right place | Wojciech Mandrysz | 2016-11-15 | 2 | -9/+10 |
| | | | | | |||||
| * | | | | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because ↵ | Wojciech Mandrysz | 2016-10-10 | 3 | -18/+24 |
| | | | | | | | | | | | | | | | | | | | | of functions limited availability, fixed typo in tests. | ||||
| * | | | | JS: Added string encoding/decoding tests for UTF-8 | Wojciech Mandrysz | 2016-10-03 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | JS: Fixed UTF-8 string encoder/decoder for high codepoints. | Wojciech Mandrysz | 2016-10-03 | 2 | -15/+36 |
| | | | | | |||||
* | | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator | Feng Xiao | 2016-11-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix #include in js_generator.cc | ||||
| * | | | | | Fix #include in js_generator.cc | Julien Brianceau | 2016-11-14 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99. | ||||
* | | | | | 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. |