aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-25244-3813/+13905
|\ | | | | | | Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
| * Delete incorrectly placed test file.Feng Xiao2015-08-251-132/+0
| |
| * Merge Java util package to github.Feng Xiao2015-08-2510-0/+4736
| |
| * Cherry-pick Java utf8 change.Feng Xiao2015-08-245-9/+149
| |
| * Down-integrate from internal code base.Feng Xiao2015-08-2319-144/+669
| |
| * Down-integrate from google3.Feng Xiao2015-08-22226-3661/+8484
| |
* | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-252-9/+4
|\ \ | |/ |/| | | | | Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.
| * Fix gcc C++11 buildNobuaki Sukegawa2015-08-012-9/+4
| |
* | Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-21477-257657/+40241
|\ \ | | | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
| * \ Merge pull request #584 from haberman/cwarningsJoshua Haberman2015-08-217-249/+354
| |\ \ | | | | | | | | Ruby: Conform to C89/C90 variable declaration rules.
| | * | Return TypedData_Wrap_Struct directly.Josh Haberman2015-08-202-4/+2
| | | | | | | | | | | | | | | | Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
| | * | Conform to C89/C90 variable declaration rules.Josh Haberman2015-07-107-247/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we are C99 in general, the Ruby build system for building C extensions enables several flags that throw warnings for C89/C90 variable ordering rules. To avoid spewing a million warnings (or trying to specifically override these warnings with command-line flags, which would be tricky and possibly fragile) we conform to Ruby's world of C89/C90. Change-Id: I0e03e62d95068dfdfde112df0fb16a248a2f32a0
| * | | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-144-150/+183
| |\ \ \ | | | | | | | | | | C# fix for TypeInitializer exception.
| | * | | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-142-149/+176
| | | | |
| | * | | add a failing descriptor testJan Tattermusch2015-08-141-0/+7
| | | | |
| | * | | remove duplicate test caseJan Tattermusch2015-08-141-1/+0
| | | | |
| * | | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-146-94/+288
| |\ \ \ \ | | |/ / / | |/| | | Add support for a file listing expected package to objc prefixes for validation.
| | * | | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-146-94/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a env var to pass a set of expected prefixes for validation. - Report warnings/errors based on the expected prefixes vs. the data in the files compiled. - Use some helpers from common directory.
| * | | | Merge pull request #716 from haberman/fixrubyJoshua Haberman2015-08-133-123/+141
| |\ \ \ \ | | | | | | | | | | | | Fixed several Ruby conformance test cases through upb update.
| | * | | | Fixed several Ruby conformance test cases through upb update.Josh Haberman2015-08-123-123/+141
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
| * | | | | Merge pull request #718 from jskeet/descriptor-descriptorJan Tattermusch2015-08-133-2/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow public access to descriptor.proto as a dependency.
| | * | | | | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-133-2/+27
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed. Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
| * | | | | Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\ \ \ \ \ | | |/ / / / | |/| | | | Install protobuf from cmake project
| | * | | | Install headers from extract_includes for all platformsKonstantin Podsvirov2015-08-041-1/+1
| | | | | |
| | * | | | Fix: comment typoKonstantin Podsvirov2015-08-031-1/+1
| | | | | |
| | * | | | Install well-known type proto files from CMake projectKonstantin Podsvirov2015-08-032-3/+57
| | | | | |
| | * | | | CMake installation now compatible with origin FindProtobuf moduleKonstantin Podsvirov2015-08-023-2/+156
| | | | | |
| | * | | | Parsing version from configure.ac for CMake projectKonstantin Podsvirov2015-08-012-15/+24
| | | | | |
| | * | | | Install protobuf from cmake projectKonstantin Podsvirov2015-07-314-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects
| * | | | | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtimeFeng Xiao2015-08-121-0/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Link runtime statically for VS build
| | * | | | only link runtime libraries statically for a static buildJan Tattermusch2015-08-121-12/+13
| | | | | |
| | * | | | make VS build link runtime staticallyJan Tattermusch2015-08-081-0/+12
| | | | | |
| * | | | | Merge pull request #706 from thomasvl/revert_any_change_2Paul Yang2015-08-113-121/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
| | * | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."Thomas Van Lenten2015-08-113-121/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7366efd81e7f36108aa35e66fca61da8a65762c2. Still some discussion about the api to expose the helpers with.
| * | | | | Merge pull request #649 from cijianzy/masterPaul Yang2015-08-111-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Update GPBWellKnownTypes.m
| | * | | | | Update GPBWellKnownTypes.mYue Zhang2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | fix an bug(forgive my english..)
| * | | | | | Merge pull request #703 from jskeet/more-todosJan Tattermusch2015-08-107-126/+168
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | More TODOs done.
| | * | | | | | More TODOs done.Jon Skeet2015-08-107-126/+168
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization - Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful - Extracted IDeepCloneable into its own file.
| * | | | | | Merge pull request #701 from jskeet/map-viewsJon Skeet2015-08-102-4/+180
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement Keys and Values as views in MapField
| | * | | | | | Fix parameter name in exception.Jon Skeet2015-08-101-1/+1
| | | | | | | |
| | * | | | | | Implement ICollection.CopyTo (using Array) for MapField views.Jon Skeet2015-08-102-1/+26
| | | | | | | |
| | * | | | | | Implement Keys and Values as viewsJon Skeet2015-08-082-4/+155
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #699 from jskeet/validate_packedJon Skeet2015-08-103-4/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Make FieldDescriptor.IsPacked work appropriately.
| | * | | | | | Make FieldDescriptor.IsPacked work appropriately.Jon Skeet2015-08-083-4/+18
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of a grotty hack, as we need to sort of fake proto2 field presence, but with only a proto3 version of the descriptor messages (a bit like oneof detection). Should be okay, but will need to be careful of this if we ever implement proto2.
| * | | | | | Merge pull request #700 from jskeet/remove-packed-hackJan Tattermusch2015-08-082-12/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Remove our own version of MakeTag now that the main one is fixed.
| | * | | | | Remove our own version of MakeTag now that the main one is fixed.Jon Skeet2015-08-072-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "Tested" by regenerating code and observing that there are no changes.
| * | | | | | Merge pull request #695 from jskeet/remove-todosJon Skeet2015-08-0817-103/+83
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Tidying up
| | * | | | | | Address review comments.Jon Skeet2015-08-081-2/+0
| | | | | | | |
| | * | | | | | Remove reference to generic types within XML comment.Jon Skeet2015-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio is happy with it, but Mono isn't :(
| | * | | | | | Tidying up - fix a bunch of TODOs and remove outdated ones.Jon Skeet2015-08-0817-102/+84
| |/ / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-09 11:50:23 +0000