aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1345 from smparkes/smparkes/well-known-protosFeng Xiao2016-03-231-0/+6
|\ \ \ | | | | | | | | export well known protos
| * | | export well known protosSteven Parkes2016-03-221-0/+6
|/ / /
* | | Merge pull request #1344 from topillar/patch-1Feng Xiao2016-03-221-1/+1
|\ \ \ | | | | | | | | Update coded_stream.h
| * | | Update coded_stream.htopillar2016-03-221-1/+1
|/ / / | | | | | | fix warning treated as error prevents building on 64-bit windows.
* | | Merge pull request #1335 from pradeepg26/masterFeng Xiao2016-03-211-4/+3
|\ \ \ | | | | | | | | Allow custom URLs for Any in JsonFormat
| * | | Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* | | | Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationThomas Van Lenten2016-03-213-3/+19
|\ \ \ \ | |/ / / |/| | | Only create the readonlySemaphore on demand.
| * | | Only create the readonlySemaphore on demand.Thomas Van Lenten2016-03-213-3/+19
|/ / / | | | | | | | | | | | | | | | This will lower the amount of dispatch_semaphores created per Message when the full object tree isn't walked in a way that would require them to be created. Uses a dispatch_once_t for one time init of the dispatch_semaphore.
| * | Code review fixesalien2016-03-295-7/+5
| | |
| * | csharp: add support for the json_name optionalien2016-03-186-8/+207
|/ / | | | | | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs
* | Merge pull request #1325 from thomasvl/shrink_overheadThomas Van Lenten2016-03-1758-5160/+1015
|\ \ | | | | | | Shrink ObjC overhead (generated size and some runtime sizes)
| * | Shrink ObjC overhead (generated size and some runtime sizes)Thomas Van Lenten2016-03-1758-5160/+1015
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: This is a binary breaking change as structure sizes have changed size and/or order. - Drop capturing field options, no other options were captured and other mobile targeted languages don't try to capture this sort information (saved 8 bytes for every field defined (in static data and again in field descriptor instance size data). - No longer generate/compile in the messages/enums in descriptor.proto. If developers need it, they should generate it and compile it in. Reduced the overhead of the core library. - Compute the number of has_bits actually needs to avoid over reserving. - Let the boolean single fields store via a has_bit to avoid storage, makes the common cases of the instance size smaller. - Reorder some flags and down size the enums to contain the bits needed. - Reorder the items in the structures to manually ensure they are are packed better (especially when generating 64bit code - 8 bytes for every field, 16 bytes for every extension, instance sizes 8 bytes also). - Split off the structure initialization so when the default is zero, the generated static storage doesn't need to reserve the space. This is batched at the message level, so all the fields for the message have to have zero defaults to get the saves. By definition all proto3 syntax files fall into this case but it also saves space for the proto2 that use the standard defaults. (saves 8 bytes of static data for every field that had a zero default) - Don't track the enums defined by a message. Nothing in the runtime needs it and it was just generation and runtime overhead. (saves 8 bytes per enum) - Ensure EnumDescriptors are started up threadsafe in all cases. - Split some of the Descriptor initialization into multiple methods so the generated code isn't padded with lots of zero/nil args. - Change how oneof info is feed to the runtime enabling us to generate less static data (8 bytes saved per oneof for 64bit). - Change how enum value informat is capture to pack the data and only decode it if it ends up being needed. Avoids padding issues causing bloat of 64bit, and removes the needs for extra pointers in addition to the data (just the data and one pointer now).
* | Merge pull request #1318 from smparkes/smparkes/grpcFeng Xiao2016-03-142-0/+33
|\ \ | | | | | | add java/util support based on java/util/pom.xml
| * | add java/util support based on java/util/pom.xmlSteven Parkes2016-03-112-0/+33
| | |
* | | Merge pull request #1291 from sergiocampama/develThomas Van Lenten2016-03-141-1/+2
|\ \ \ | | | | | | | | Adds more information to Objective C error.
| * | | Adds more information to Objective C error when the expected ↵Sergio Campama2016-03-031-1/+2
| | |/ | |/| | | | | | | objc_class_prefix option is missing.
* | | Merge pull request #1312 from petewarden/masterJisi Liu2016-03-121-2/+43
|\ \ \ | |_|/ |/| | Bazel iOS build settings
| * | Merge remote-tracking branch 'upstream/master'Pete Warden2016-03-0976-2393/+3886
| |\ \
| * | | Added iOS settings to Bazel buildPete Warden2016-03-091-3/+19
| | | |
| * | | Updated library generation with iOS optionsPete Warden2016-02-231-2/+27
| | | |
* | | | Merge pull request #1278 from smparkes/masterJisi Liu2016-03-112-9/+27
|\ \ \ \ | | | | | | | | | | pass correct args to protoc for wellknown protos when used as an external repository
| * | | | pass correct args to protoc for java wellknown protos when used as an ↵Steven Parkes2016-03-102-9/+27
| | |/ / | |/| | | | | | | | | | external repository
* | | | Merge pull request #1317 from benvanik/patch-1Feng Xiao2016-03-111-1/+3
|\ \ \ \ | |/ / / |/| | | Fixing compilation error when building with emscripten.
| * | | Fixing compilation error when building with emscripten.Ben Vanik2016-03-111-1/+3
|/ / / | | | | | | This change was previously done in //third_party in CL 108656107 but never made it to the open source project and was overwritten in an update.
* | | Merge pull request #1299 from tatraian/masterFeng Xiao2016-03-081-1/+5
|\ \ \ | | | | | | | | Fix compiling clang/libc++ builds. (Issue: #1266)
| * | | Comment has been added to fix (issue #1266)Antal Tátrai2016-03-081-0/+4
| | | |
| * | | Fix compiling clang/libc++ builds. (Issue: #1266)Antal Tátrai2016-03-051-1/+1
| | | |
* | | | Merge pull request #1309 from thomasvl/leading_special_prop_namesThomas Van Lenten2016-03-084-6/+40
|\ \ \ \ | | | | | | | | | | Fix up handing of fields with leading names that should be all caps.
| * | | | Fix up handing of fields with leading names that should be all caps.Thomas Van Lenten2016-03-084-6/+40
|/ / / / | | | | | | | | | | | | Add a compile test to confirm things are working as expected.
* | | | Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
|\ \ \ \ | | | | | | | | | | Update version to 3.0.0b2.post2
| * | | | Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
| | | | |
* | | | | Merge pull request #1304 from thomasvl/headerdocsThomas Van Lenten2016-03-0735-1363/+1985
|\ \ \ \ \ | | | | | | | | | | | | HeaderDoc support in the library and generated sources
| * | | | | HeaderDoc support in the library and generated sourcesThomas Van Lenten2016-03-0735-1363/+1985
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Convert most of the core library headers over to HeaderDoc format. - Switch the generated comments over to HeaderDoc. - Create GPBCodedOutputStream_PackagePrivate and move some things into there that should be more internal.
* | | | | Merge pull request #1301 from avgweb/masterJon Skeet2016-03-075-131/+157
|\ \ \ \ \ | | | | | | | | | | | | Replace StringBuilder with TextWriter in JsonFormatter
| * | | | | Replace StringBuilder with TextWriter in JsonFormatteravgweb2016-03-065-131/+157
|/ / / / /
* | | | | Merge pull request #1298 from craigcitro/fix_setupJoshua Haberman2016-03-051-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Add back the namespace_packages arg in setup.py.
| * | | | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves #1296. The problem: in the previous patch, we tweaked the __init__.py files to use namespaces, but no longer declared ourselves as a namespace package. The second half was unwise. Note that this only comes up when installing protobuf alongside another package that also installs into the google namespace; as of right now, the only PyPI package that does is googleapis-common-protos, though the GAE SDK also uses google.appengine. Installing either or both of those alongside this package now works. The case that still remains is the upgrade path, which is also what worried me in #713. It seems that if protobuf 2.6.1 is installed, there's no way to safely upgrade that to work with a newer protobuf. However, `pip uninstall` && `pip install` does the trick.
* | | | Merge pull request #1139 from haberman/rubyjsoncamelJoshua Haberman2016-03-048-676/+1172
|\ \ \ \ | | | | | | | | | | Changed Ruby to properly camelCase its JSON by default.
| * | | | Updated upb from latest changes.Josh Haberman2016-02-182-244/+133
| | | | |
| * | | | Changed Ruby to properly camelCase its JSON by default.Josh Haberman2016-02-188-561/+1168
| | | | |
* | | | | Merge pull request #1292 from haberman/ruby-allow-descriptorJoshua Haberman2016-03-044-87/+117
|\ \ \ \ \ | |_|_|_|/ |/| | | | Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
| * | | | Removed the generated Ruby file from Makefile.am.Josh Haberman2016-03-031-1/+0
| | | | |
| * | | | Generate well-known types in Ruby extension and prune unneeded proto2 ↵Josh Haberman2016-03-033-86/+117
|/ / / / | | | | | | | | | | | | dependencies.
* | | | Merge pull request #1260 from legrosbuffle/masterPaul Yang2016-03-021-2/+4
|\ \ \ \ | | | | | | | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
| * | | | Make cpp generated enum constants constexpr when Options::proto_h isClement Courbet2016-02-191-2/+4
| | | | | | | | | | | | | | | | | | | | specified.
* | | | | Merge pull request #1287 from jskeet/fix-typoJon Skeet2016-03-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix copy/paste typo in CodedInputStreamTest
| * | | | | Fix copy/paste typo in CodedInputStreamTestJon Skeet2016-03-011-1/+1
|/ / / / /
* | | | | Merge pull request #1274 from murgatroid99/node_relative_requiresJoshua Haberman2016-02-298-11/+160
|\ \ \ \ \ | | | | | | | | | | | | Fix CommonJS relative require generation, and test it
| * | | | | Moved CommonJS-specific files into commonjs directorymurgatroid992016-02-244-12/+15
| | | | | |
| * | | | | Fix CommonJS relative require generation, and test itmurgatroid992016-02-248-11/+157
| | |_|_|/ | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 09:29:48 +0000