aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #486 from thomasvl/assets_podspecJisi Liu2015-06-108-16/+16
|\ | | | | Update podspec, rename assets to drop @
| * Update podspec for files that can build now, rename assets to not need @ in ↵Thomas Van Lenten2015-06-108-16/+16
| | | | | | | | the name.
* | Merge pull request #483 from thomasvl/fixup_travis_2Feng Xiao2015-06-102-7/+31
|\ \ | | | | | | Remove the OS X checks from travis.sh, instead use excludes
| * | Remove the OS X checks from travis.sh, instead use excludes to not fire up a ↵Thomas Van Lenten2015-06-102-7/+31
| | | | | | | | | | | | vm for something we can't test.
* | | Merge pull request #477 from haberman/upbupdateJoshua Haberman2015-06-105-5482/+5855
|\ \ \ | |_|/ |/| | Updated upb to latest version (C89).
| * | Fixed compiler warnings and added -std=c99.Josh Haberman2015-06-092-10/+7
| | | | | | | | | | | | | | | upb no longer requires -std=c99 but the Ruby/C code still uses C99 features.
| * | Updated upb to latest version (C89).Josh Haberman2015-06-084-5473/+5849
| |/ | | | | | | | | Since this version of upb supports C89, all of the extra compiler flags are no longer required.
* | Merge pull request #484 from TeBoring/tempPaul Yang2015-06-091-1/+1
|\ \ | | | | | | Update version number of objective-c to 3.0.0-alpha-4-pre
| * | Update version number of objective-c to 3.0.0-alpha-4-preBo Yang2015-06-091-1/+1
| | |
* | | Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-0994-8018/+6910
|\ \ \ | |/ / |/| | Beta quality drop of Objective C Support.
| * | Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-0894-8018/+6910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Exclude 3 failing tests on osx from travis.Feng Xiao2015-06-081-0/+8
| |
* | Merge pull request #469 from xfxyjwf/vsprojectsFeng Xiao2015-06-0816-2963/+56
|\ \ | |/ |/| Remove vsprojects.
| * Remove vsprojects.Feng Xiao2015-06-0516-2963/+56
| |
* | Merge pull request #361 from brianduff/sync_aospFeng Xiao2015-06-061-12/+10
|\ \ | | | | | | Speed up little endian int/long writes.
| * | Speed up little endian int/long writes.Jeff Davidson2015-05-111-12/+10
| | | | | | | | | | | | | | | Bug: 20636336 Change-Id: I303d712967f9885f7c3082d00f961f8ab93a6aed
* | | 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.
* | | | Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSEFeng Xiao2015-06-061-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fixed bug in GOOGLE_PREDICT_FALSE.
| * | | 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.
* | | Update ./update_file_lists.sh.Feng Xiao2015-06-053-10/+127
| | | | | | | | | | | | Make it executable and generate extract_includes.bat in the same directory.
* | | Add back incorrectly excluded cmake targets.Feng Xiao2015-06-051-1/+2
|/ /
* | Merge pull request #460 from haberman/conformance-namesJoshua Haberman2015-06-055-60/+235
|\ \ | | | | | | Conformance tests can now be excluded based on their names.
| * | Removed test_name from conformance.proto.Josh Haberman2015-06-044-15/+15
| | | | | | | | | | | | Change-Id: I382dcda97fa123a6da4ff5faad5d7ece95853f33
| * | Conformance tests can now be excluded based on their names.Josh Haberman2015-06-036-59/+234
| | | | | | | | | | | | | | | | | | | | | This allows us to enable conformance tests even when we know that some tests are failing and need to be fixed. Change-Id: I372f43663008747db6f2b2cf06e6ffa4c6d85b2d
* | | Merge pull request #462 from anandolee/masterJie Luo2015-06-0428-1647/+1861
|\ \ \ | | | | | | | | Migrate writer to printer for C#
| * | | Migrate writer to io::Printer for C#Jie Luo2015-06-0428-1647/+1861
| | | |
* | | | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-0412-11/+767
|\ \ \ \ | | | | | | | | | | Add cmake support.
| * | | | Fix README.md formatting.Feng Xiao2015-06-041-34/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
| * | | | Add an cmake option to exclude tests.Feng Xiao2015-06-041-2/+4
| | | | |
| * | | | Add cmake support.Feng Xiao2015-05-3112-11/+756
| | | | |
* | | | | Merge pull request #456 from xfxyjwf/androidJisi Liu2015-06-042-494/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove Android.mk
| * | | | Remove Android.mkFeng Xiao2015-06-022-494/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file bares a different copyright license and also doesn't actually work (out-dated file lists, no config.h/pbconfig.h, refers to inexist AOSP paths).
* | | | | 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 #447 from murgatroid99/podspec_fixPaul Yang2015-06-021-8/+19
|\ \ \ \ | | | | | | | | | | Add remaining not-already-imported well known types files to podspec
| * \ \ \ Merge pull request #1 from jcanizales/podspec_fixMichael Lumish2015-06-021-7/+19
| |\ \ \ \ | | | | | | | | | | | | A few corrections to the proposed podspec
| | * | | | Reorder fields so it looks like exclude_files affects preserve_pathsJorge Canizales2015-06-021-4/+4
| | | | | |
| | * | | | Better documentationJorge Canizales2015-06-021-4/+4
| | | | | |
| | * | | | Remove backslashes after commasJorge Canizales2015-06-021-12/+13
| | | | | |
| | * | | | Remove struct.proto too (redefines GPBValue)Jorge Canizales2015-06-021-1/+1
| | | | | |
| | * | | | s/pobjc/pbobjc and simplify a bit the podspecJorge Canizales2015-06-021-3/+14
| |/ / / /
| * | | | Ignored files that cause build errorsmurgatroid992015-06-011-3/+2
| | | | |
| * | | | Add remaining not-already-imported well known types files to podspecmurgatroid992015-06-011-1/+1
| |/ / /
* | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 06:30:15 +0000