Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix C2385: accessing parent classes' member without specifying is ambiguous. | Bo Yang | 2015-05-24 | 1 | -4/+5 |
| | |||||
* | Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASH | Feng Xiao | 2015-05-22 | 1 | -1/+1 |
|\ | | | | | Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used. | ||||
| * | Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used. | Yohei Yukawa | 2015-05-04 | 1 | -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_drop | Paul Yang | 2015-05-22 | 20 | -101/+223 |
|\ \ | | | | | | | Objective C Second Alpha Drop | ||||
| * | | Objective C Second Alpha Drop | Thomas Van Lenten | 2015-05-22 | 20 | -101/+223 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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/master | Paul Yang | 2015-05-21 | 142 | -2990/+15154 |
|\ \ \ | | | | | | | | | down-integrate internal changes | ||||
| * | | | down-integrate internal changes | Bo Yang | 2015-05-21 | 142 | -2990/+15154 |
| |/ / | |||||
* | | | Merge pull request #411 from xfxyjwf/master | Paul Yang | 2015-05-21 | 1 | -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 Xiao | 2015-05-21 | 1 | -0/+64 |
| |/ / | | | | | | | | | | | | | | | | protoc. Change-Id: I4afa295de4c8ed2a4cd0919cf84aedcd1327d9a5 | ||||
* / / | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 1 | -0/+3 |
|/ / | | | | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | ||||
* | | Merge pull request #402 from thomasvl/objc_on_win | Paul Yang | 2015-05-21 | 9 | -102/+28 |
|\ \ | | | | | | | Getting the ObjC generator building on Windows. | ||||
| * | | Getting the ObjC generator building on Windows. | Thomas Van Lenten | 2015-05-19 | 9 | -102/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Marked compiler literal unsigned. | Austin Schuh | 2015-05-19 | 3 | -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. | ||||
* | | Post csharp landing fixup. | Thomas Van Lenten | 2015-05-18 | 7 | -13/+18 |
| | | | | | | | | | | Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC). | ||||
* | | Merge pull request #384 from google/csharp | Jie Luo | 2015-05-14 | 62 | -55/+5299 |
|\ \ | | | | | | | Merge protobuf C# into master (only C# proto2 is supported) | ||||
| * \ | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 73 | -92/+6218 |
| |\ \ | |||||
| * | | | Remove the C#-specific field_presence_test.proto, using ↵ | Jon Skeet | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_no_field_presence.proto instead. This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos. We could optionally split the directory structure as well into Proto2 and Proto3 for clarity. | ||||
| * | | | Regenerate descriptor.pb.cc after csharp_namespace change | Jon Skeet | 2015-05-07 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | Jon Skeet | 2015-05-06 | 27 | -7/+35 |
| | | | | |||||
| * | | | Remove ClsCompliant declarations from C# code | Jie Luo | 2015-05-01 | 7 | -38/+1 |
| | | | | |||||
| * | | | fix bug for Field Presence | Jie Luo | 2015-04-27 | 2 | -2/+2 |
| | | | | |||||
| * | | | Field Presence: remove has methods for optional non-message fields in proto3 | Jie Luo | 2015-04-27 | 4 | -42/+129 |
| | | | | |||||
| * | | | Merge pull request #288 from jtattermusch/csharp_protobuf_reviewed | Jie Luo | 2015-04-17 | 36 | -52/+5213 |
| |\ \ \ | | | | | | | | | | | C# protocol buffers (initial pull request) | ||||
| | * | | | forgot to include header files into automake template | Jan Tattermusch | 2015-04-17 | 1 | -1/+15 |
| | | | | | |||||
| | * | | | temporarily removing csharp_umbrella_namespace file option | Jan Tattermusch | 2015-04-17 | 4 | -233/+46 |
| | | | | | |||||
| | * | | | removing csharp_property_name field option | Jan Tattermusch | 2015-04-17 | 4 | -223/+35 |
| | | | | | |||||
| | * | | | one more fix to csharp_umbrella_namespace comment | Jan Tattermusch | 2015-04-17 | 1 | -3/+5 |
| | | | | | |||||
| | * | | | fix: do not mention umbrella_classname in comment | Jan Tattermusch | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed comment for csharp_umbrella_namespace (nest_classes has been removed) | Jan Tattermusch | 2015-04-16 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | fixing field number of csharp_umbrella_namespace option | Jan Tattermusch | 2015-04-16 | 3 | -15/+15 |
| | | | | | |||||
| | * | | | integrate CalcSerializedSize() fix from protobuf-csharp-port issue 84 | Jan Tattermusch | 2015-04-13 | 1 | -4/+12 |
| | | | | | |||||
| | * | | | fixing implementation of GetFileUmbrellaNamespace | Jan Tattermusch | 2015-04-13 | 1 | -18/+22 |
| | | | | | |||||
| | * | | | implemented HasRequiredFields logic | Jan Tattermusch | 2015-04-13 | 1 | -2/+37 |
| | | | | | |||||
| | * | | | addressed TODO for lite runtime | Jan Tattermusch | 2015-04-13 | 1 | -7/+11 |
| | | | | | |||||
| | * | | | creating private ctor for builders is now the default (as it used to be for ↵ | Jan Tattermusch | 2015-04-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | old codegen) | ||||
| | * | | | output file naming logic, configurable file extension, comment rewording | Jan Tattermusch | 2015-04-13 | 3 | -16/+24 |
| | | | | | |||||
| | * | | | added support for deprecated fields, reworded some todos | Jan Tattermusch | 2015-04-13 | 3 | -8/+6 |
| | | | | | |||||
| | * | | | enable overriding of property name using csharp_property_name | Jan Tattermusch | 2015-04-13 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | updated C# codegen to use restricted set of csharp options from descriptor.proto | Jan Tattermusch | 2015-04-13 | 8 | -52/+27 |
| | | | | | |||||
| | * | | | restricted number of csharp options and regenerated descriptor.proto | Jan Tattermusch | 2015-04-13 | 3 | -1348/+243 |
| | | | | | |||||
| | * | | | Rewrote C# protogen to C++ (initial version) | Jan Tattermusch | 2015-03-26 | 36 | -49/+6640 |
| | | | | | |||||
* | | | | | Include generated code of well-known types in protobuf C++ runtime. | Feng Xiao | 2015-05-11 | 23 | -6/+15668 |
| |_|/ / |/| | | | | | | | | | | | Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c | ||||
* | | | | Merge branch 'gerrit' to 'master' | Feng Xiao | 2015-05-07 | 13 | -15/+265 |
|\ \ \ \ | |||||
| * | | | | Modify directory to use in test | Bo Yang | 2015-04-27 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iede1dc4e70427663e0d3c5304fa86b3aebf492b7 | ||||
| * | | | | Handle un-handled cases of TestOneof2 in unittest | Bo Yang | 2015-04-27 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | Change-Id: I8f082ee3117ed873ab472a539867ff7cae58e8fd | ||||
| * | | | | internal changes | Bo Yang | 2015-04-24 | 10 | -15/+246 |
| | | | | | | | | | | | | | | | | | | | | Change-Id: I66f216c70a19f44637090878d7e442d4d0f8991b | ||||
* | | | | | Merge pull request #101 from fizbin/fix_large_proto_java_code | Feng Xiao | 2015-05-07 | 5 | -26/+116 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix java compilation issues when processing large .proto files | ||||
| * | | | | | More 'int' return value documentation | Daniel Martin | 2015-04-09 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | CR feedback: spacing, document return values | Daniel Martin | 2015-04-08 | 2 | -1/+5 |
| | | | | | | |||||
| * | | | | | Fix java compilation issues when processing large .proto files | Daniel Martin | 2014-11-25 | 5 | -25/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues 579 and 501 on the code.google.com issues list. Specifically, large .proto files lead to too much static code, leading to a compilation error from javac: "code too large". This divides the code used in static initialization into multiple methods to avoid that error. Also, this incorporates the fix in issue 501 on the code.google.com issues list to call registry.add only once per extension. |