aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ObjC fixup for the branch.Thomas Van Lenten2015-05-266-35/+15
| | | | | | | | - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar
* Replace the check of "../.git"Feng Xiao2015-05-261-25/+24
| | | | | | | Checking the existence of ".git" is not the right way to check whether we are in develop environment because we distribute source tar-balls where such a ".git" directory does not exist. Replaced it with checking .proto files.
* Add new headers to extract_includes.batBo Yang2015-05-251-2/+16
|
* Add new files to Makefile.amBo Yang2015-05-251-1/+32
|
* Add csharp_EXTRA_DIST to all_EXTRA_DIST.Bo Yang2015-05-251-1/+1
|
* Add new files for java runtime to Makefile.amTeBoring2015-05-251-0/+3
|
* Explicitly call destructor of Mutex to release resources.Feng Xiao2015-05-251-1/+5
| | | | Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec
* Make hash_map forward constructor parameters to its base class.Feng Xiao2015-05-251-6/+17
| | | | | | | | We use a custom allocator for map fields and this allocator must be passed correctly to hash_map to make sure it's allocated properly with our custom allocator. Change-Id: Ie59fa24bf11ff28ffd0fa870e24e456c66b2b9c5
* Add csharp files to Makefile.amBo Yang2015-05-251-0/+249
|
* Add objectivec/generate_descriptors_proto.sh in Makefile.amBo Yang2015-05-251-0/+1
|
* Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in ↵Bo Yang2015-05-254-7/+150
| | | | src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby
* Remove useless slash in Makefile.amTeBoring2015-05-251-22/+22
|
* Fix bugs in objective-c.Bo Yang2015-05-258-25/+248
|
* Merge pull request #422 from google/3.0.0-alpha-3-windows-fixPaul Yang2015-05-2513-45/+197
|\ | | | | 3.0.0 alpha 3 windows fix
| * Fix bugs on windows.Bo Yang2015-05-2411-41/+64
| |
| * Merge pull request #421 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-242-4/+133
|/| | | | | Fix c++ on windows
| * Merge branch '3.0.0-alpha-3-fix' of https://github.com/TeBoring/protobuf ↵teboring2015-05-242-4/+14
| |\ | | | | | | | | | into 3.0.0-alpha-3-fix
| * | Add missing files for test to *.vcproj filesteboring2015-05-242-4/+133
| | |
* | | Merge pull request #420 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-242-4/+14
|\ \ \ | | |/ | |/| Fix C2385: ambiguous access to parent classes' member without specifying
| * | Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-242-4/+14
| |/
* | Allow csharp to be configured as a language in configure.acteboring2015-05-231-1/+1
| |
* | Merge pull request #419 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-233-22/+39
|\| | | | | Add missing files to *.vcproj
| * Add missing files to *.vcprojteboring2015-05-233-22/+39
| |
* | Merge pull request #418 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-235-1504/+376
|\| | | | | Clean up *.vcproj files
| * Clean up *.vcproj filesteboring2015-05-235-1504/+376
|/
* Add two languages (objectivec and csharp) to post_process_dist.shteboring2015-05-231-1/+1
|
* Merge pull request #416 from TeBoring/masterPaul Yang2015-05-237-9/+9
|\ | | | | Update version number to 3.0.0-alpha-3
| * 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.