Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 3.1.x into master. | Bo Yang | 2016-10-13 | 1 | -9/+1 |
|\ | |||||
| * | Merge pull request #2203 from mrry/msvc_fix | Feng Xiao | 2016-10-11 | 1 | -9/+1 |
| |\ | | | | | | | Fix MSVC build when HAVE_LONG_LONG is defined. | ||||
| | * | Fix MSVC build when HAVE_LONG_LONG is defined. | Derek Murray | 2016-09-29 | 1 | -9/+1 |
| | | | |||||
| * | | Merge pull request #2193 from acozzette/common-js-fix | Adam Cozzette | 2016-10-04 | 1 | -14/+16 |
| |\ \ | | | | | | | | | Fixed references to foreign nested messages with CommonJS-style imports | ||||
| | * | | Fixed references to foreign nested messages with CommonJS-style imports | Adam Cozzette | 2016-09-27 | 1 | -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 proto3 | Adam Cozzette | 2016-10-04 | 2 | -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 Xiao | 2016-09-23 | 1 | -0/+5 |
| | | |||||
| * | Fix VS test failures. | Feng Xiao | 2016-09-23 | 2 | -6/+24 |
| | | |||||
| * | Reduce test length to avoid stack overflow on VS. | Feng Xiao | 2016-09-23 | 1 | -3/+3 |
| | | |||||
| * | Fix Visual Studio compile issues. | Feng Xiao | 2016-09-23 | 28 | -462/+748 |
| | | | | | | | | Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e | ||||
| * | Fix default instance destructor | Jisi Liu | 2016-09-23 | 14 | -13/+112 |
| | | |||||
| * | Add back removed descriptor field. | Bo Yang | 2016-09-22 | 3 | -137/+230 |
| | | |||||
| * | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) ↵ | Adam Cozzette | 2016-09-21 | 1 | -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.1 | Bo Yang | 2016-09-21 | 13 | -29/+29 |
| | | |||||
| * | Fix bugs for internal integration. | Bo Yang | 2016-09-20 | 1 | -1/+1 |
| | | |||||
| * | Integrate internal changes | Bo Yang | 2016-09-19 | 152 | -5232/+9438 |
| | | |||||
* | | Do strict enum name checking only for proto3 | Adam Cozzette | 2016-10-10 | 2 | -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 imports | Adam Cozzette | 2016-10-10 | 1 | -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 Xiao | 2016-10-10 | 1 | -0/+5 |
| | | |||||
* | | Fix VS test failures. | Feng Xiao | 2016-10-10 | 2 | -6/+24 |
| | | |||||
* | | Reduce test length to avoid stack overflow on VS. | Feng Xiao | 2016-10-10 | 1 | -3/+3 |
| | | |||||
* | | Fix Visual Studio compile issues. | Feng Xiao | 2016-10-10 | 28 | -462/+748 |
| | | | | | | | | Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e | ||||
* | | Fix default instance destructor | Jisi Liu | 2016-10-10 | 14 | -13/+112 |
| | | |||||
* | | Add back removed descriptor field. | Bo Yang | 2016-10-10 | 3 | -137/+230 |
| | | |||||
* | | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) ↵ | Adam Cozzette | 2016-10-10 | 1 | -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.1 | Bo Yang | 2016-10-10 | 13 | -29/+29 |
| | | |||||
* | | Fix bugs for internal integration. | Bo Yang | 2016-10-10 | 1 | -1/+1 |
| | | |||||
* | | Integrate internal changes | Bo Yang | 2016-10-10 | 152 | -5232/+9430 |
| | | |||||
* | | Silence compile warnings in bazel | Andy Hochhaus | 2016-10-09 | 2 | -9/+17 |
| | | |||||
* | | Merge pull request #2192 from google/3.0.x | Jisi Liu | 2016-09-27 | 13 | -13/+13 |
|\ \ | | | | | | | Merge 3.0.x into master. | ||||
| * | | Update generated files. | Jisi Liu | 2016-09-14 | 12 | -12/+12 |
| | | | |||||
| * | | Fix the version number for 3.0.2 | Jisi Liu | 2016-09-13 | 1 | -1/+1 |
| | | | |||||
* | | | Fixes static analyzer issues from xcode. | Sergio Campama | 2016-09-20 | 5 | -4/+7 |
| |/ |/| | |||||
* | | Merge pull request #2112 from pherl/merge | Jisi Liu | 2016-09-15 | 27 | -8/+152 |
|\ \ | | | | | | | Merge 3.0.x into master | ||||
| * | | Merge remote-tracking branch 'origin/3.0.x' into merge | Jisi Liu | 2016-09-14 | 27 | -8/+152 |
| |\| | |||||
| | * | Fix #2032 unused parameter 'deterministic' | Khing | 2016-09-08 | 13 | -0/+55 |
| | | | | | | | | | | | | | | | | | | Parameter deterministic is unused in InternalSerializeWithCachedSizesToArray(), which generates unused parameter warning in every message. | ||||
| | * | Merge pull request #1862 from pherl/3.0.0-GA | Jisi Liu | 2016-09-02 | 3 | -14/+2 |
| | |\ | | | | | | | | | Cherry pick c# changes from master | ||||
| | | * | Remove legacy_enum_values flag for GA. | Jon Skeet | 2016-07-27 | 3 | -14/+2 |
| | | | | |||||
| | * | | Fixes extra whitespace on generated comments. (#1950) | Sergio Campamá | 2016-08-17 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | Fixes extra whitespace on generated comments. | ||||
| | * | | Adds support for appledoc in generated code. (#1928) | Sergio Campamá | 2016-08-17 | 9 | -37/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866 | ||||
| | * | | Add and fix C++ runtime docs | Jisi Liu | 2016-08-02 | 14 | -8/+97 |
| | |/ | |||||
* | | | Merge pull request #2123 from thomasvl/objc_better_versioning_take2 | Thomas Van Lenten | 2016-09-15 | 1 | -10/+14 |
|\ \ \ | | | | | | | | | Update the ObjC version checks to support a min and current version. | ||||
| * | | | Update the ObjC version checks to support a min and current version. | Thomas Van Lenten | 2016-09-15 | 1 | -10/+14 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | - Capture the version used to generated. - Check at compile time and runtime that generated code isn't from a newer version, also check that the min version required is also supported. - Keep the old constants/macros/functions to special case the last version that was working so those generated sources still work until we decide otherwise. | ||||
* / / | Check in php implementation. (#2052) | Paul Yang | 2016-09-15 | 3 | -6/+842 |
|/ / | | | | | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields. | ||||
* | | Merge pull request #2044 from wychen/Win32ANSI | Feng Xiao | 2016-09-09 | 3 | -14/+19 |
|\ \ | | | | | | | Fix Win32 error messages on Unicode build | ||||
| * | | Fix Win32ErrorMessage on Unicode build | Wei-Yin Chen (陳威尹) | 2016-08-31 | 1 | -6/+6 |
| | | | |||||
| * | | Add test for Win32ErrorMessage | Wei-Yin Chen (陳威尹) | 2016-08-31 | 1 | -0/+5 |
| | | | |||||
| * | | Support Unicode build on Windows | Wei-Yin Chen (陳威尹) | 2016-08-31 | 1 | -8/+8 |
| | | | |||||
* | | | Merge pull request #2090 from guoxiao/find | Feng Xiao | 2016-09-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | include std::find() | ||||
| * | | | include std::find() | Guo Xiao | 2016-09-08 | 1 | -0/+1 |
| | | | |