aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #495 from pherl/masterJisi Liu2015-06-132-18/+145
|\ | | | | Make pbconfig.h independent of config.h
| * Make pbconfig.h independent of config.hJisi Liu2015-06-132-18/+145
| | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
* | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-123-15/+61
|\ \ | | | | | | Workaround for MSVC's string literal compiler limit.
| * | Workaround for MSVC's string literal compiler limit.Qartar2015-06-123-15/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape characters don't count for string literal size, no need to pre-generate escape string. Added unit test to touch enormous cpp generated descriptor. Updated makefile to include enormous_descriptor.proto Fixed language compatibility error.
* | | Give descriptor.proto a go packageTamir Duberstein2015-06-122-3/+5
| |/ |/| | | | | | | This is currently done in golang/protobuf using `sed`. This change should simplify things.
* | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0914-554/+355
|\ \ | | | | | | Beta quality drop of Objective C Support.
| * | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0814-554/+355
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add more to the ObjC dir readme. - Merge the ExtensionField and ExtensionDescriptor to reduce overhead. - Fix an initialization race. - Clean up the Xcode schemes. - Remove the class/enum filter. - Remove some forced inline that were bloating things without proof of performance wins. - Rename some internal types to avoid conflicts with the well know types protos. - Drop the use of ApplyFunctions to the compiler/optimizer can do what it wants. - Better document some possible future improvements. - Add missing support for parsing repeated primitive fields in packed or unpacked forms. - Improve -hash. - Add *Count for repeated and map<> fields to avoid auto create when checking for them being set.
* / Refactored threadlocal logic.Austin Schuh2015-06-085-9/+15
|/ | | | | | | Refactored the threadlocal logic for Android and IOS into logic in platform_macro.h which computes a GOOGLE_PROTOBUF_NO_THREADLOCAL define which is then used elsewhere. This allows new platforms without THREADLOCAL to be easily defined.
* Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\ | | | | Marked another compiler literal unsigned.
| * Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling a protobuf with gcc 4.1.2 for powerpc, I ran into another of 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.
* | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
|/ | | | | | | The GOOGLE_PREDICT_FALSE macro is both incorrect, and doesn't match the macro definition in glog, which causes conflicts when including both libraries. This commit fixes that by making it identical to what is in glog.
* Merge pull request #462 from anandolee/masterJie Luo2015-06-0425-1632/+1846
|\ | | | | Migrate writer to printer for C#
| * Migrate writer to io::Printer for C#Jie Luo2015-06-0425-1632/+1846
| |
* | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-041-11/+8
|\ \ | | | | | | Add cmake support.
| * | Add cmake support.Feng Xiao2015-05-311-11/+8
| | |
* | | Merge pull request #453 from bakineggs/masterFeng Xiao2015-06-031-0/+14
|\ \ \ | | | | | | | | Add protoc path detection for Mac OS
| * | | Add protoc path detection for Mac OSDan Barry2015-06-021-0/+14
| | | |
* | | | Merge pull request #444 from xfxyjwf/vs2010_fixFeng Xiao2015-06-022-9/+9
|\ \ \ \ | |/ / / |/| / / | |/ / Fix two issues on vs2010.
| * | Call copy() only if there is something to copy.Feng Xiao2015-05-311-1/+3
| | | | | | | | | | | | | | | | | | RepeatedField::begin()/end() will return NULL when the content is empty. Passing these NULL values to std::copy() will result in runtime complains from some compilers (e.g., vs2010).
| * | Fix MapAllocator::destroy() bug.Feng Xiao2015-05-311-8/+6
| | | | | | | | | | | | | | | destroy() should always call the destructor because the caller may rely on the destructor to do clean-ups.
* | | Merge pull request #305 from ezegomez/masterFeng Xiao2015-06-021-1/+1
|\ \ \ | | | | | | | | Fix unittest in i386
| * | | Fix unittest in i386Ezequiel Lara Gomez2015-04-271-1/+1
| | | |
* | | | Merge pull request #441 from anandolee/masterJan Tattermusch2015-06-012-168/+23
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Change the C# enum generator inherit from primitive generator
| * | Change the C# enum generator inherit from primitive generatorJie Luo2015-05-292-168/+23
| | |
* | | Merge pull request #404 from anandolee/masterJie Luo2015-05-2910-53/+463
|\| | | | | | | | Add oneof support for c#
| * | Add oneof support for C#Jie Luo2015-05-2910-53/+463
| | |
* | | Fixes on visual studio 2008unknown2015-05-277-11/+14
| | |
* | | Replace "\\" with "/" for windows path names.Feng Xiao2015-05-261-0/+4
| | |
* | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 12:57:48 +0000