aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #510 from pherl/bazelJisi Liu2015-06-182-95/+2
|\ | | | | Remove OUTS constants in BUILD
| * Remove OUTS constants in BUILDJisi Liu2015-06-182-95/+2
|/ | | | | | | Induce those from the input proto file names instead to reduce the lenght of the BUILD file. Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
* Merge pull request #509 from pherl/update_BUILDJisi Liu2015-06-181-2/+65
|\ | | | | Update BUILD for the recent json util change.
| * Update BUILD for the recent json util change.Jisi Liu2015-06-181-2/+65
|/ | | | Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
* Merge pull request #508 from pherl/nanfixJisi Liu2015-06-181-1/+1
|\ | | | | using ::isnan to avoid conflicts with std::isnan for C++11 build.
| * using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
|/ | | | Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
* Fix distcheck.Jisi Liu2015-06-181-1/+1
| | | | Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
* Merge pull request #505 from pherl/bazelJisi Liu2015-06-185-122/+593
|\ | | | | Add bazel support for the project
| * Remove redundant includeJisi Liu2015-06-181-1/+0
| | | | | | | | Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
| * Add Bazel BUILD for the project.Jisi Liu2015-06-173-49/+524
| | | | | | | | Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
| * Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-6/+4
| | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-17103-207/+28289
|\ \ | |/ |/| Down-integrate from internal code base.
| * Fix broken builds.Feng Xiao2015-06-1732-136/+190
| |
| * Down-integrate from internal code base.Feng Xiao2015-06-15101-198/+28226
| | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* | Merge pull request #497 from pherl/config_hJisi Liu2015-06-1613-156/+23
|\ \ | |/ |/| Check HAVE_CONFIG_H before including "config.h"
| * Make the code independent of config.hJisi Liu2015-06-1613-156/+23
|/ | | | | | | | | | | | | Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather than providing a config.h - Make pbconfig.h a manually written file to handle hash conditions according to platform related macros. - Remove #include "config.h" from source code. - Changed the configure.ac and Makefile.am to pass down the macros. - Change cmake to pass down the the macros. Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
* Merge pull request #499 from xfxyjwf/appveyorFeng Xiao2015-06-151-1/+1
|\ | | | | Add a badge for AppVeyor build.
| * Add a badge for AppVeyor build.Feng Xiao2015-06-151-1/+1
| | | | | | | | Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
* | Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
|\ \ | |/ |/| Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
| * Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
| |
* | Merge pull request #498 from pherl/rmconfigJisi Liu2015-06-132-8/+0
|\ \ | | | | | | Remove config.h.include which is no longer needed
| * | Remove the file from Makefile.amJisi Liu2015-06-131-1/+0
| | | | | | | | | | | | Change-Id: I2015df2409aa95401af658b40023c8f9b9d75068
| * | Remove config.h.include which is no longer needed as pbconfig.h is not aJisi Liu2015-06-131-7/+0
|/ / | | | | | | | | | | generated file now. Change-Id: I68b397e7fa9248abc93d5c12efd5cd31e380c9ab
* | Merge pull request #495 from pherl/masterJisi Liu2015-06-133-19/+145
|\ \ | | | | | | Make pbconfig.h independent of config.h
| * | Make pbconfig.h independent of config.hJisi Liu2015-06-133-19/+145
| |/ | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
* | Add appveyor.xml for windows tests.Feng Xiao2015-06-121-0/+33
| |
* | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-124-15/+62
|\ \ | | | | | | Workaround for MSVC's string literal compiler limit.
| * | Workaround for MSVC's string literal compiler limit.Qartar2015-06-124-15/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #489 from tamird/go-package-descriptorFeng Xiao2015-06-122-3/+5
|\ \ \ | |_|/ |/| | Give descriptor.proto a go package
| * | 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 #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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 16:43:15 +0000