aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #509 from pherl/update_BUILDGravatar Jisi Liu2015-06-18
|\ | | | | Update BUILD for the recent json util change.
| * Update BUILD for the recent json util change.Gravatar Jisi Liu2015-06-18
|/ | | | Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
* Merge pull request #508 from pherl/nanfixGravatar Jisi Liu2015-06-18
|\ | | | | using ::isnan to avoid conflicts with std::isnan for C++11 build.
| * using ::isnan to avoid conflicts with std::isnan for C++11 build.Gravatar Jisi Liu2015-06-18
|/ | | | Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
* Fix distcheck.Gravatar Jisi Liu2015-06-18
| | | | Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
* Merge pull request #505 from pherl/bazelGravatar Jisi Liu2015-06-18
|\ | | | | Add bazel support for the project
| * Remove redundant includeGravatar Jisi Liu2015-06-18
| | | | | | | | Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
| * Add Bazel BUILD for the project.Gravatar Jisi Liu2015-06-17
| | | | | | | | Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
| * Move cmake/update_file_lists.sh preparing for bazel support.Gravatar Jisi Liu2015-06-17
| | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | Merge pull request #501 from xfxyjwf/downGravatar Feng Xiao2015-06-17
|\ \ | |/ |/| Down-integrate from internal code base.
| * Fix broken builds.Gravatar Feng Xiao2015-06-17
| |
* | Merge pull request #497 from pherl/config_hGravatar Jisi Liu2015-06-16
|\ \ | | | | | | Check HAVE_CONFIG_H before including "config.h"
| * | Make the code independent of config.hGravatar Jisi Liu2015-06-16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Down-integrate from internal code base.Gravatar Feng Xiao2015-06-15
|/ | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* Merge pull request #499 from xfxyjwf/appveyorGravatar Feng Xiao2015-06-15
|\ | | | | Add a badge for AppVeyor build.
* \ Merge pull request #488 from AustinSchuh/ruby_test_fixGravatar Feng Xiao2015-06-15
|\ \ | | | | | | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
| | * Add a badge for AppVeyor build.Gravatar Feng Xiao2015-06-15
| |/ |/| | | | | Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
* | Merge pull request #498 from pherl/rmconfigGravatar Jisi Liu2015-06-13
|\ \ | | | | | | Remove config.h.include which is no longer needed
| * | Remove the file from Makefile.amGravatar Jisi Liu2015-06-13
| | | | | | | | | | | | Change-Id: I2015df2409aa95401af658b40023c8f9b9d75068
| * | Remove config.h.include which is no longer needed as pbconfig.h is not aGravatar Jisi Liu2015-06-13
|/ / | | | | | | | | | | generated file now. Change-Id: I68b397e7fa9248abc93d5c12efd5cd31e380c9ab
* | Merge pull request #495 from pherl/masterGravatar Jisi Liu2015-06-13
|\ \ | | | | | | Make pbconfig.h independent of config.h
| * | Make pbconfig.h independent of config.hGravatar Jisi Liu2015-06-13
| | | | | | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
* | | Add appveyor.xml for windows tests.Gravatar Feng Xiao2015-06-12
| | |
* | | Merge pull request #481 from Qartar/masterGravatar Feng Xiao2015-06-12
|\ \ \ | | | | | | | | Workaround for MSVC's string literal compiler limit.
* \ \ \ Merge pull request #489 from tamird/go-package-descriptorGravatar Feng Xiao2015-06-12
|\ \ \ \ | |_|/ / |/| | | Give descriptor.proto a go package
| | * | Workaround for MSVC's string literal compiler limit.Gravatar Qartar2015-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 packageGravatar Tamir Duberstein2015-06-12
|/ / / | | | | | | | | | | | | This is currently done in golang/protobuf using `sed`. This change should simplify things.
| | * Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFGravatar Austin Schuh2015-06-10
| |/ |/|
* | Merge pull request #486 from thomasvl/assets_podspecGravatar Jisi Liu2015-06-10
|\ \ | | | | | | Update podspec, rename assets to drop @
| * | Update podspec for files that can build now, rename assets to not need @ in ↵Gravatar Thomas Van Lenten2015-06-10
| | | | | | | | | | | | the name.
* | | Merge pull request #483 from thomasvl/fixup_travis_2Gravatar Feng Xiao2015-06-10
|\ \ \ | | | | | | | | Remove the OS X checks from travis.sh, instead use excludes
* \ \ \ Merge pull request #477 from haberman/upbupdateGravatar Joshua Haberman2015-06-10
|\ \ \ \ | |_|/ / |/| | | Updated upb to latest version (C89).
| | * | Remove the OS X checks from travis.sh, instead use excludes to not fire up a ↵Gravatar Thomas Van Lenten2015-06-10
| | | | | | | | | | | | | | | | vm for something we can't test.
* | | | Merge pull request #484 from TeBoring/tempGravatar Paul Yang2015-06-09
|\ \ \ \ | | | | | | | | | | Update version number of objective-c to 3.0.0-alpha-4-pre
* \ \ \ \ Merge pull request #480 from thomasvl/objc_beta_dropGravatar Paul Yang2015-06-09
|\ \ \ \ \ | | | | | | | | | | | | Beta quality drop of Objective C Support.
| | * | | | Update version number of objective-c to 3.0.0-alpha-4-preGravatar Bo Yang2015-06-09
| |/ / / / |/| | | |
| | * | | Fixed compiler warnings and added -std=c99.Gravatar Josh Haberman2015-06-09
| | | | | | | | | | | | | | | | | | | | | | | | | upb no longer requires -std=c99 but the Ruby/C code still uses C99 features.
* | | | | Refactored threadlocal logic.Gravatar Austin Schuh2015-06-08
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Updated upb to latest version (C89).Gravatar Josh Haberman2015-06-08
| |/ / |/| | | | | | | | | | | Since this version of upb supports C89, all of the extra compiler flags are no longer required.
| * | Beta quality drop of Objective C Support.Gravatar Thomas Van Lenten2015-06-08
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Exclude 3 failing tests on osx from travis.Gravatar Feng Xiao2015-06-08
| |
* | Merge pull request #469 from xfxyjwf/vsprojectsGravatar Feng Xiao2015-06-08
|\ \ | |/ |/| Remove vsprojects.
* | Merge pull request #361 from brianduff/sync_aospGravatar Feng Xiao2015-06-06
|\ \ | | | | | | Speed up little endian int/long writes.
* \ \ Merge pull request #468 from AustinSchuh/unsigned_protoGravatar Feng Xiao2015-06-06
|\ \ \ | | | | | | | | Marked another compiler literal unsigned.
* \ \ \ Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSEGravatar Feng Xiao2015-06-06
|\ \ \ \ | | | | | | | | | | Fixed bug in GOOGLE_PREDICT_FALSE.
| | | | * Remove vsprojects.Gravatar Feng Xiao2015-06-05
| |_|_|/ |/| | |
* | | | Update ./update_file_lists.sh.Gravatar Feng Xiao2015-06-05
| | | | | | | | | | | | | | | | Make it executable and generate extract_includes.bat in the same directory.
| | * | Marked another compiler literal unsigned.Gravatar Austin Schuh2015-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Add back incorrectly excluded cmake targets.Gravatar Feng Xiao2015-06-05
| |/ / |/| |
| * | Fixed bug in GOOGLE_PREDICT_FALSE.Gravatar Austin Schuh2015-06-05
|/ / | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 00:52:49 +0000