aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1267 from jskeet/vs2015Jan Tattermusch2016-02-221-3/+3
|\ | | | | Require VS2015 in the solution file
| * Require VS2015 in the solution fileJon Skeet2016-02-221-3/+3
| |
* | Merge pull request #804 from bsilver8192/masterFeng Xiao2016-02-223-0/+160
|\ \ | |/ |/| Add atomics support for 32-bit PPC.
| * Add atomics support for 32-bit PPC.Brian Silverman2015-09-093-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | This was originally submitted as a patch on the Google Code issue tracker, but the original author didn't submit a pull request. They did, however, give permission for somebody else to do so. I cleaned up a few things myself and am now submitting it. I can't find any record of what the original patch was, but there is a copy of the discussion at <https://groups.google.com/forum/#!topic/protobuf/SMwF5fYHIi0>. Fixes google/protobuf#581
* | Merge pull request #1215 from haberman/commonjsJoshua Haberman2016-02-1914-79/+667
|\ \ | | | | | | Added support for CommonJS require()
| * | Added a bit more to README.md, and allowed custom PROTOC var in tests.Josh Haberman2016-02-192-2/+28
| | |
| * | Properly camelCase when translating to CommonJS.Josh Haberman2016-02-181-1/+17
| | |
| * | Removed unused directives from tests that aren't run under CommonJS.Josh Haberman2016-02-182-4/+0
| | |
| * | Addressed more code review comments.Josh Haberman2016-02-182-22/+28
| | |
| * | Integrate review comments.Josh Haberman2016-02-185-6/+18
| | |
| * | Greatly expanded README.md.Josh Haberman2016-02-181-10/+130
| | |
| * | Use "node" as binary instead of "nodejs".Josh Haberman2016-02-181-1/+1
| | | | | | | | | | | | "nodejs" does not exist on Travis, it appears.
| * | Fixed definition of extensions, and added CommonJS tests to Travis.Josh Haberman2016-02-183-2/+13
| | |
| * | Fixed nested message scopes for CommonJS.Josh Haberman2016-02-187-28/+46
| | |
| * | Added some documentation in comments.Josh Haberman2016-02-183-2/+31
| | |
| * | Moved CommonJS-specific files to commonjs/.Josh Haberman2016-02-185-4/+4
| | |
| * | CommonJS tests are now passing.Josh Haberman2016-02-1813-20/+152
| | |
| * | WIP.Josh Haberman2016-02-186-64/+286
| | |
* | | Merge pull request #1257 from thomasvl/objc_genericsThomas Van Lenten2016-02-1935-490/+588
|\ \ \ | | | | | | | | Support ObjC Generic Collections
| * | | Support ObjC Generic CollectionsThomas Van Lenten2016-02-1835-490/+588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extend GPB*ObjectDictionary to support generic syntax. - Update the generator to output generics so the enclosed type is exposed for compiler checks. - Use generics in a the public interfaces. - Update the generated sources that are checked in.
* | | | Merge pull request #1240 from jskeet/validate_groupJan Tattermusch2016-02-183-12/+77
|\ \ \ \ | | | | | | | | | | Validate that end-group tags match their corresponding start-group tags
| * | | | Validate that end-group tags match their corresponding start-group tagsJon Skeet2016-02-153-12/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This detects: - An end-group tag with the wrong field number (doesn't match the start-group field) - An end-group tag with no preceding start-group tag Fixes issue #688.
* | | | | Merge pull request #1258 from haberman/releasenotesJoshua Haberman2016-02-181-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Some fixes for the most recent release notes.
| * | | | Some fixes for the most recent release notes.Josh Haberman2016-02-181-1/+5
|/ / / /
* | | | Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failingThomas Van Lenten2016-02-181-0/+4
|\ \ \ \ | | | | | | | | | | List python_cpp as failing on OS X
| * | | | List python_cpp as failing on OS XThomas Van Lenten2016-02-181-0/+4
|/ / / /
* | | | Merge pull request #1254 from thomasvl/disable_xctool_updatesThomas Van Lenten2016-02-182-8/+8
|\ \ \ \ | | | | | | | | | | Disable the xctool updates
| * | | | Disable the xctool updatesThomas Van Lenten2016-02-182-8/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In light of https://github.com/google/protobuf/issues/1232, disable the xctool update so we stay on 0.2.7 which seems to work better. Remove the passing of -newSimulatorInstance since the older xctool doesn't support it.
* | | | Merge pull request #1239 from jskeet/call_generate_protosJon Skeet2016-02-182-1/+6
|\ \ \ \ | |_|/ / |/| | | Generate C# code whenever descriptor.proto changes
| * | | Generate C# code whenever descriptor.proto changesJon Skeet2016-02-152-1/+6
| |/ / | | | | | | | | | | | | | | | | | | This is a start to fixing issue #1212. It won't help for test protos, conformance etc, but it will definitely be better than nothing, and would have highlighted a change in descriptor.proto which broken C# earlier.
* | | Merge pull request #1229 from keveman/unlimited_binary_protoJoshua Haberman2016-02-172-4/+23
|\ \ \ | | | | | | | | Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when
| * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-162-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString.
* | | | Merge pull request #1241 from jskeet/more-merge-wrapper-testsJan Tattermusch2016-02-171-2/+41
|\ \ \ \ | | | | | | | | | | Add more tests around merging wrappers
| * | | | Add more tests around merging wrappersJon Skeet2016-02-151-2/+41
| | |/ / | |/| | | | | | | | | | This was in an attempt to fix the wrapper handling corner case, but it's really fiddly.
* | | | Merge pull request #260 from ejsd1989/issue-#242Joshua Haberman2016-02-162-4/+2
|\ \ \ \ | | | | | | | | | | Removes redundant null pointer checks checks
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Removed the redundant check for NULL which is already handled by using delete
| * | | | Removal of null checkeissajamil@gmail.com2015-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Removed the redundant check for NULL which is already correctly handled by used the delete
* | | | | Merge pull request #1224 from google/rubysentinelJoshua Haberman2016-02-161-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Removed 'optional' from proto3 syntax file.
| * | | | | Removed 'optional' from proto3 syntax file.Josh Haberman2016-02-101-9/+9
| | | | | |
* | | | | | Merge pull request #1247 from thomasvl/xctool_plain_outputThomas Van Lenten2016-02-161-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis.
| * | | | | | Move the xctool use of -reporter into a common spot and always use "plain" ↵Thomas Van Lenten2016-02-161-5/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | to get more readable logs on travis.
* | | | | | Merge pull request #1245 from thomasvl/tweak_xctool_ios_runThomas Van Lenten2016-02-161-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tweak the xctool run for iOS tests to try and sort out flake
| * | | | | | Tweak the xctool run for iOS tests to try and sort out flakeThomas Van Lenten2016-02-161-1/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Use the plain reporter for slightly more readable logs. - Add -newSimulatorInstance to the run-tests to see if it helps with flake.
* | | | | | Merge pull request #1244 from thomasvl/bump_xcode_versionThomas Van Lenten2016-02-163-5/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Bump up travis to Xcode 7.2
| * | | | | Bump up travis to Xcode 7.2Thomas Van Lenten2016-02-163-5/+16
|/ / / / / | | | | | | | | | | | | | | | | | | | | - Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause.
* | | | | Merge pull request #1226 from jcanizales/patch-1Paul Yang2016-02-121-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Include 'source' attribute in the podspec
| * | | | | Include 'source' attribute in the podspecJorge Canizales2016-02-101-0/+3
| | | | | | | | | | | | | | | | | | The new version of Cocoapods requires it even when using the podspec locally.
* | | | | | Merge pull request #1144 from dongjoon-hyun/remove_redundant_theJoshua Haberman2016-02-1110-12/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove redundant `the`.
| * | | | | Rewrap the lineDongjoon Hyun2016-02-111-2/+1
| | | | | |
| * | | | | Remove redundant `the` in comments.Dongjoon Hyun2016-02-0310-11/+11
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 01:45:17 +0000