aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update version number to 3.0.0-alpha-3teboring2015-05-237-9/+9
|
* Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASHFeng Xiao2015-05-221-1/+1
|\ | | | | Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
| * Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.Yohei Yukawa2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | This is a follow up CL for df184fba00acc7d4aa7b9d64693c53c815a64eda (Id937e25bbb35968ee76c92bd4a8ce6247408c443), which added #undef GOOGLE_PROTOBUF_MISSING_HASH where GOOGLE_PROTOBUF_MISSING_HASH macro is never defined. With this CL, GOOGLE_PROTOBUF_MISSING_HASH macro will be cleaned up after it is used.
* | Merge pull request #410 from thomasvl/objc_alpha2_dropPaul Yang2015-05-2295-1254/+6091
|\ \ | | | | | | Objective C Second Alpha Drop
| * | Objective C Second Alpha DropThomas Van Lenten2015-05-2295-1254/+6091
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Style fixups in the code. - map<> serialization fixes and more tests. - Autocreation of map<> fields (to match repeated fields). - @@protoc_insertion_point(global_scope|imports). - Fixup proto2 syntax extension support. - Move all startup code to +initialize so it happen on class usage and not app startup. - Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds.
* | | Merge pull request #413 from TeBoring/masterPaul Yang2015-05-21227-3789/+25713
|\ \ \ | | | | | | | | down-integrate internal changes
| * | | down-integrate internal changesBo Yang2015-05-21227-3789/+25713
| | | |
* | | | Merge pull request #411 from xfxyjwf/masterPaul Yang2015-05-211-0/+64
|\ \ \ \ | | | | | | | | | | Add default import paths for descriptor.proto and well-known protos.
| * | | | Add default import paths for descriptor.proto and other well-known types to ↵Feng Xiao2015-05-211-0/+64
| |/ / / | | | | | | | | | | | | | | | | | | | | protoc. Change-Id: I4afa295de4c8ed2a4cd0919cf84aedcd1327d9a5
* | | | Merge pull request #412 from xfxyjwf/java_wktPaul Yang2015-05-213-0/+97
|\ \ \ \ | |/ / / |/| | | Include well-known types in Java runtime.
| * | | Include well-known types in Java runtime.Feng Xiao2015-05-213-0/+97
|/ / / | | | | | | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
* | | Merge pull request #389 from jcanizales/add-podspecPaul Yang2015-05-212-1/+24
|\ \ \ | |/ / |/| | Adds a podspec for the proto3 Objective-C runtime.
| * | Adds the podspec to objectivec_EXTRA_DIST in Makefile.amJorge Canizales2015-05-141-1/+2
| | |
| * | Undo previous commit: Make all headers public instead.Jorge Canizales2015-05-141-1/+0
| | | | | | | | | | | | | | | Apparently, in Cocoapods, all recursive #imports of public headers need to be public.
| * | Restricts public headers to GPBProtocolBuffers.h and ↵Jorge Canizales2015-05-141-1/+1
| | | | | | | | | | | | GPBProtocolBuffers_RuntimeSupport.h
| * | Makes _PackagePrivate.h files privateJorge Canizales2015-05-141-2/+2
| | |
| * | Adds the initial version of the podspec for the proto3 Objective-C runtime.Jorge Canizales2015-05-141-0/+23
| | |
* | | Merge pull request #402 from thomasvl/objc_on_winPaul Yang2015-05-2111-103/+125
|\ \ \ | | | | | | | | Getting the ObjC generator building on Windows.
| * | | Getting the ObjC generator building on Windows.Thomas Van Lenten2015-05-1911-103/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ClassList support (maybe bring it back in the future). Trim the includes to hopefully get a working Window build. Add some more returns after switches for compilers that warn even when all values of the enum are handled. Use ghtonl instead of htonl. Change the use of [u]int(8,32)_t within the ObjC generator code to [u]int(8,32) to match the rest of the compiler. Add objective-c generator files to Visual Studio project.
* | | | Merge pull request #394 from ironhidegames/csharp-aot-iosJan Tattermusch2015-05-211-3/+15
|\ \ \ \ | | | | | | | | | | Solves AOT compilation issue for Unity - iOS
| * | | | added concrete IEqualityComparer<ExtensionIntPair> implementation in ↵Ruben Garat2015-05-201-3/+15
| | | | | | | | | | | | | | | | | | | | ExtensionRegistryLite.cs to prevent AOT compilation issue with unity in iOS
* | | | | Merge pull request #406 from AustinSchuh/unsigned_has_bitsFeng Xiao2015-05-203-16/+16
|\ \ \ \ \ | | | | | | | | | | | | Marked compiler literal unsigned.
| * | | | | Marked compiler literal unsigned.Austin Schuh2015-05-193-16/+16
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling a protobuf with gcc 3.3.2 for powerpc, I ran into the following warning message: INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc: bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member function `virtual void MyProto::Clear()': bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this decimal constant is unsigned only in ISO C90 The line in the proto file that was triggering it was: if (_has_bits_[24 / 32] & 4278190080) { ZR_(field1_, field2_); } _has_bits_ is a uint32. The constant mask should therefore be unsigned. This change updates the constant to be generated as unsigned.
* | | | | Merge pull request #399 from jtattermusch/csharp_travisJie Luo2015-05-202-0/+15
|\ \ \ \ \ | |/ / / / |/| | | | C# travis integration
| * | | | csharp travis integrationJan Tattermusch2015-05-182-0/+15
| | | | |
* | | | | Merge pull request #405 from cfallin/ruby-speedJoshua Haberman2015-05-197-29/+45
|\ \ \ \ \ | |/ / / / |/| | | | Ruby C extension speedup: don't re-intern constant string needlessly.
| * | | | Ruby C extension speedup: don't re-intern constant string needlessly.Chris Fallin2015-05-197-29/+45
|/ / / / | | | | | | | | | | | | Also fixed lines with > 80 char length.
* | | | Merge pull request #397 from jskeet/csharpJan Tattermusch2015-05-185-39464/+31319
|\ \ \ \ | | | | | | | | | | Generate *all* protos in the script, applying fixups.
| * | | | Generate *all* protos in the script, applying fixups.Jon Skeet2015-05-165-39464/+31319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have some protos which aren't generated how we want them to be: - Until we have an option to specify the "umbrella" class, DescriptorProtoFile will be broken. (The change of name here affects the reflection descriptor, which accounts for most of the change. That's easier than trying to work out exactly which occurrences of Descriptor need changing though.) - That change affects UnittestCustomOptions - Issue #307 breaks Unittest.cs After this commit, we don't have the record of the fixups in the files themselves any more, but one centralized record in the shell script.
* | | | | Merge pull request #387 from cfallin/ruby-upb-updateJoshua Haberman2015-05-186-749/+1408
|\ \ \ \ \ | | | | | | | | | | | | Update MRI C Ruby extension to use new version of upb (with upb_env).
| * | | | | Update MRI C Ruby extension to use new version of upb.Chris Fallin2015-05-156-749/+1408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Alter encode/decode paths to use the `upb_env` (environment) abstraction. - Update upb amalgamation to upstream `93791bfe`. - Fix a compilation warning (void*->char* cast). - Modify build flags so that upb doesn't produce warnings -- the Travis build logs were pretty cluttered previously.
* | | | | | Merge pull request #398 from thomasvl/post_csharp_quick_updatesPaul Yang2015-05-189-13/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Post csharp landing fixup.
| * | | | | Post csharp landing fixup.Thomas Van Lenten2015-05-189-13/+36
|/ / / / / | | | | | | | | | | | | | | | | | | | | Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC).
* | | | | Merge pull request #351 from tamird/remove-manifest-fix-distJoshua Haberman2015-05-153-13/+15
|\ \ \ \ \ | |_|/ / / |/| | | | [PYTHON] Only generate protos in development
| * | | | Only generate protos in developmentTamir Duberstein2015-05-152-0/+8
| | | | | | | | | | | | | | | | | | | | Fixes #333.
| * | | | Allow tests to run on OS XTamir Duberstein2015-05-151-1/+2
| | | | |
| * | | | Don't hardcode bashTamir Duberstein2015-05-152-2/+2
| | | | |
| * | | | Use glob to simplifyTamir Duberstein2015-05-151-10/+3
|/ / / /
* | | | Merge pull request #338 from skippy/encode-decode-helpersChris Fallin2015-05-1511-114/+182
|\ \ \ \ | | | | | | | | | | ruby: Encode decode cleanup and behavior normalization
| * | | | adding and simplifying encoders/decodersAdam Greene2015-05-1311-114/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make consistent between mri and jruby * create a #to_h and have it use symbols for keys * add #to_json and #to_proto helpers on the Google::Protobuf message classes
* | | | | Merge pull request #391 from jtattermusch/generate_protos_windows_friendlyJie Luo2015-05-153-8/+23
|\ \ \ \ \ | | | | | | | | | | | | Make generate_protos.sh Windows-friendly.
| * | | | | Make generate_protos.sh Windows-friendly.Jon Skeet2015-05-143-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To my surprise, executing generate_protos.sh used the version of Bash installed with Git for Windows by default. After a few modifications to detect the most appropriate protoc to use, this worked pretty simply. This change also: - adds generation of the address book tutorial proto, - fixes the addressbook.proto to specify proto2 explicitly (to avoid a warning from protoc; I don't think we want warnings...) - fixes the addressbook.proto C# namespace (which I thought I'd done before, but apparently hadn't) - includes the regenerated UnittestCustomOptions.cs apart from the DescriptorProtoFIle => Descriptor change
* | | | | | Merge pull request #385 from cfallin/travis-refactorChris Fallin2015-05-143-20/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor Travis tests: split configs and run in parallel.
| * | | | | | Refactor Travis tests: split configs and run in parallel.Chris Fallin2015-05-143-20/+172
| | | | | | |
* | | | | | | Merge pull request #384 from google/csharpJie Luo2015-05-14314-55/+267908
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | | Merge protobuf C# into master (only C# proto2 is supported)
| * | | | | Merge pull request #382 from jtattermusch/integrate_from_masterJie Luo2015-05-13255-323/+84482
| |\ \ \ \ \ | | | | | | | | | | | | | | Integrate changes from latest master branch into csharp branch.
| | * | | | | Regenerate UnittestDropUnknownFields.csJan Tattermusch2015-05-131-2/+2
| | | | | | |
| | * | | | | Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-13254-321/+84480
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Merge pull request #380 from jtattermusch/csharpJie Luo2015-05-131-8/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Update README.md for C#
| | * | | | | Update README.md for C#Jan Tattermusch2015-05-131-8/+28
| |/ / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 00:32:33 +0000