aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* In std11, on mac, operator new doesn't take right reference.TeBoring2015-05-261-1/+1
|
* Merge pull request #430 from xfxyjwf/std11_fixPaul Yang2015-05-261-0/+12
|\ | | | | Make MapAllocator work with C++11.
| * Make MapAllocator work with C++11.Feng Xiao2015-05-261-0/+12
| | | | | | | | Change-Id: I0e1d9e248403631cb57ebed5231e85d19b9bb3df
* | Merge pull request #429 from xfxyjwf/std11_fixPaul Yang2015-05-261-6/+0
|\| | | | | Remove std::is_trivially_default_constructible.
| * Remove std::is_trivially_default_constructible.Feng Xiao2015-05-261-6/+0
| | | | | | | | This type_traits is only added after g++ 5.1.0 but we need to support g++ 4+.
* | When doing make distcheck, a src/google/protobuf/compiler/ruby is created toBo Yang2015-05-261-3/+3
|/ | | | | put built libraries. This directory hides the one that contains ruby_generated_code.proto and ruby_generated_code.rb.
* uint64 has non-trivial destructor on 32-bit windows. This cause arenaBo Yang2015-05-261-5/+5
| | | | allocator to allocate memory twice for uint64.
* Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
|
* 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
* 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
* Fix bugs on windows.Bo Yang2015-05-2411-41/+64
|
* Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-241-4/+5
|
* 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-2220-101/+223
|\ \ | | | | | | Objective C Second Alpha Drop
| * | Objective C Second Alpha DropThomas Van Lenten2015-05-2220-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/masterPaul Yang2015-05-21142-2990/+15154
|\ \ \ | | | | | | | | down-integrate internal changes
| * | | down-integrate internal changesBo Yang2015-05-21142-2990/+15154
| |/ /
* | | 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
* / / Include well-known types in Java runtime.Feng Xiao2015-05-211-0/+3
|/ / | | | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
* | Merge pull request #402 from thomasvl/objc_on_winPaul Yang2015-05-219-102/+28
|\ \ | | | | | | Getting the ObjC generator building on Windows.
| * | Getting the ObjC generator building on Windows.Thomas Van Lenten2015-05-199-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 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.
* | Post csharp landing fixup.Thomas Van Lenten2015-05-187-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/csharpJie Luo2015-05-1462-55/+5299
|\ \ | | | | | | Merge protobuf C# into master (only C# proto2 is supported)
| * \ Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-1373-92/+6218
| |\ \
| * | | Remove the C#-specific field_presence_test.proto, using ↵Jon Skeet2015-05-131-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 changeJon Skeet2015-05-071-2/+3
| | | |
| * | | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-0627-7/+35
| | | |
| * | | Remove ClsCompliant declarations from C# codeJie Luo2015-05-017-38/+1
| | | |
| * | | fix bug for Field PresenceJie Luo2015-04-272-2/+2
| | | |
| * | | Field Presence: remove has methods for optional non-message fields in proto3Jie Luo2015-04-274-42/+129
| | | |
| * | | Merge pull request #288 from jtattermusch/csharp_protobuf_reviewedJie Luo2015-04-1736-52/+5213
| |\ \ \ | | | | | | | | | | C# protocol buffers (initial pull request)
| | * | | forgot to include header files into automake templateJan Tattermusch2015-04-171-1/+15
| | | | |
| | * | | temporarily removing csharp_umbrella_namespace file optionJan Tattermusch2015-04-174-233/+46
| | | | |
| | * | | removing csharp_property_name field optionJan Tattermusch2015-04-174-223/+35
| | | | |
| | * | | one more fix to csharp_umbrella_namespace commentJan Tattermusch2015-04-171-3/+5
| | | | |
| | * | | fix: do not mention umbrella_classname in commentJan Tattermusch2015-04-171-1/+1
| | | | |
| | * | | Fixed comment for csharp_umbrella_namespace (nest_classes has been removed)Jan Tattermusch2015-04-161-2/+1
| | | | |
| | * | | fixing field number of csharp_umbrella_namespace optionJan Tattermusch2015-04-163-15/+15
| | | | |
| | * | | integrate CalcSerializedSize() fix from protobuf-csharp-port issue 84Jan Tattermusch2015-04-131-4/+12
| | | | |
| | * | | fixing implementation of GetFileUmbrellaNamespaceJan Tattermusch2015-04-131-18/+22
| | | | |
| | * | | implemented HasRequiredFields logicJan Tattermusch2015-04-131-2/+37
| | | | |
| | * | | addressed TODO for lite runtimeJan Tattermusch2015-04-131-7/+11
| | | | |
| | * | | creating private ctor for builders is now the default (as it used to be for ↵Jan Tattermusch2015-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | old codegen)
| | * | | output file naming logic, configurable file extension, comment rewordingJan Tattermusch2015-04-133-16/+24
| | | | |
| | * | | added support for deprecated fields, reworded some todosJan Tattermusch2015-04-133-8/+6
| | | | |
| | * | | enable overriding of property name using csharp_property_nameJan Tattermusch2015-04-131-1/+3
| | | | |