aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Fix Visual Studio compile issues.Feng Xiao2016-09-2328-462/+748
| |/ / | | | | | | | | | Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
| * | Merge pull request #2170 from pherl/3.1.xJisi Liu2016-09-2314-13/+112
| |\ \ | | | | | | | | Fix default instance destructor and memory leaks
| | * | Fix default instance destructorJisi Liu2016-09-2314-13/+112
| | | |
| | * | Merge branch '3.1.x' of github.com:google/protobuf into 3.1.xJisi Liu2016-09-2323-588/+371
| | |\ \ | | |/ / | |/| |
| * | | Update version number.Bo Yang2016-09-221-1/+1
| | | |
| * | | Bump library version to 11Bo Yang2016-09-221-2/+2
| | | |
| * | | Add back removed descriptor field.Bo Yang2016-09-224-195/+321
| | | |
| * | | Modify php api version and minimum supported php version.Bo Yang2016-09-221-6/+7
| | | |
| * | | PHP: support 7.0 on PHP implementation (#2162)Stanley Cheung2016-09-222-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | * PHP: support 7.0 * Also fix in test_util.php
| * | | update files to include php generators (#2165)Jisi Liu2016-09-223-1/+7
| | | |
| * | | Update version number.Feng Xiao2016-09-2213-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
| * | | Fix java compatibilty tests.Feng Xiao2016-09-221-350/+1
| | | | | | | | | | | | | | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
| | * | update files to include php generatorsJisi Liu2016-09-223-1/+7
| | | |
| | * | Update minimum support php version to 5.5Charlene2016-09-211-1/+1
| |/ /
| * | Fix bugs for internal integration.Bo Yang2016-09-221-3/+3
| | |
| * | Fix hash computation for JRuby's RubyMessageBrendan Ribera2016-09-221-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `System.identityHashCode` returns a hash that does not consider a Message's values. This means two Messages with identical values will not have identical hashCodes. This patch uses the pattern from RubyMap to combine the hashCodes from all values in a given message and produce a unique, consistent, value-based hash.
| * | Fix travis, jenkins environment issues.Bo Yang2016-09-213-3/+3
| | |
| * | Added new has_bits.h file to cmake/extract_includes.bat.in (#2152)Adam Cozzette2016-09-211-0/+1
| | | | | | | | | | | | This is necessary so that the CMake build knows to include this header file in the installation include/ directory.
| * | 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().
| * | Fix bugs for csharp and ruby for internal integration.Bo Yang2016-09-212-217/+215
| | |
| * | Fix python bugs for internal integration.Bo Yang2016-09-213-5/+13
| | |
| * | Bump library veriosn to 3.1Bo Yang2016-09-2125-166/+127
| | |
| * | Fix bugs for internal integration.Bo Yang2016-09-209-1586/+11
| | |
| * | Fix gson dependency.Bo Yang2016-09-202-2/+2
| | | | | | | | | | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
| * | Bump version number to 3.1.0-alpha-1.Bo Yang2016-09-2015-15/+15
| | |
| * | Fix for maps_test.js in JavaScript. (#2145)Joshua Haberman2016-09-202-63/+31
| | | | | | | | | | | | | | | Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out.
| * | Fix bugs for internal integration.Bo Yang2016-09-194-41/+49
| | |
| * | Use a custom dictionary to avoid NSNumber operations.Thomas Van Lenten2016-09-191-16/+31
| | | | | | | | | | | | | | | For the secondary dictionary, use a custom CFDictionary with integer keys to avoid the NSNumber conversions.
| * | Remove the custom key functions and just use the system provided defaults.Thomas Van Lenten2016-09-191-40/+3
| | |
| * | Integrate internal changesBo Yang2016-09-19280-8143/+19655
| | |
* | | Add 32-bit machine test on jenkins. (#2245)Paul Yang2016-10-126-13/+130
| | |
* | | Merge pull request #2246 from fweikert/patch-1Feng Xiao2016-10-121-1/+3
|\ \ \ | | | | | | | | Declare all inputs of protoc action
| * | | Declare all inputs of protoc actionFlorian Weikert2016-10-121-1/+3
|/ / / | | | | | | | | | | | | ctx.executable.plugin must be in the inputs of protoc's action when using a plugin, otherwise the action will fail. This bug has been hidden by a bug in Bazel: for every ctx.action, Bazel used to automatically add the runfiles of all executable inputs of the RULE instead of using the inputs of the specific ACTION. Consequently, we could get away with underspecifying the inputs of the action.
* | | Merge pull request #2234 from TeBoring/masterPaul Yang2016-10-10335-8603/+19074
|\ \ \ | | | | | | | | Merge 3.1.x branch into master.
| * | | Fix python_cpp test on Mac. Link staticly when building extension, so that ↵Paul Yang2016-10-102-2/+3
| | | | | | | | | | | | | | | | the extension doesn't require installing protobuf library. (#2232)
| * | | Add csharp/build_tools.sh for dist check.Bo Yang2016-10-101-0/+1
| | | |
| * | | Fix compile error for php on Mac.Bo Yang2016-10-1011-39/+55
| | | |
| * | | Fix segmentation fault when ZTS is defined.Bo Yang2016-10-105-34/+39
| | | |
| * | | PHP: fix ZTS tsrm_ls errors (#2189)Stanley Cheung2016-10-106-59/+69
| | | | | | | | | | | | | | | | | | | | | | | | * PHP: fix ZTS tsrm_ls errors * Fix a few more macros
| * | | Add test for php zts build.Bo Yang2016-10-101-4/+16
| | | |
| * | | Prepare jenkins for testing php zts build.Bo Yang2016-10-101-0/+6
| | | |
| * | | 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.
| * | | Add travis test on Mac for php.Bo Yang2016-10-102-9/+20
| | | |
| * | | Test php5.5_c test on jenkinsBo Yang2016-10-103-30/+36
| | | |
| * | | Trigger automated tests for php.Bo Yang2016-10-101-0/+6
| | | |
| * | | Set up environment for php automated tests.Bo Yang2016-10-101-6/+46
| | | |
| * | | Add php test script for automated tests.Bo Yang2016-10-101-5/+59
| | | |
| * | | Add script to build Google.Protobuf.Tools for csharp.Bo Yang2016-10-101-0/+52
| | | |
| * | | Added alias getFieldProto3 as used by older generated code.Josh Haberman2016-10-101-0/+12
| | | | | | | | | | | | | | | | | | | | Un-breaks users who have old generated code and upgrade to the 3.1.0 release.
| * | | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-10-104-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.