aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
|\ | | | | MinGW64+MSYS2 compilation issues
| * MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| |
* | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
|\ \ | | | | | | Delete default UnknownFieldSet when shuting down.
| * | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
| | |
* | | Merge pull request #556 from mgiuca/fix-clang-warningFeng Xiao2015-06-301-1/+1
|\ \ \ | |_|/ |/| | Fix "sometimes-uninitialized" warning on Windows Clang.
| * | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
|/ /
* | Merge pull request #540 from pherl/clean-warningsJisi Liu2015-06-253-11/+6
|\ \ | | | | | | fix compiler warnings.
| * | fix compiler warnings.Jisi Liu2015-06-243-11/+6
| | | | | | | | | | | | | | | | | | | | | - control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
* | | Merge pull request #512 from pherl/bazelPaul Yang2015-06-244-77/+140
|\ \ \ | | | | | | | | Enable tests for bazel build.
| * | | Enable tests for bazel build.Jisi Liu2015-06-184-77/+140
| | | | | | | | | | | | | | | | Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
* | | | Merge pull request #538 from google/jtattermusch-patch-1Jisi Liu2015-06-241-1/+1
|\ \ \ \ | |_|/ / |/| | | fix typo in cmake/README.md
| * | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
|/ / /
* | | Merge pull request #530 from haberman/updateupbJoshua Haberman2015-06-232-19/+54
|\ \ \ | | | | | | | | Update upb to fix two bugs in the Ruby library.
| * | | Update upb to fix two bugs in the Ruby library.Josh Haberman2015-06-222-19/+54
|/ / / | | | | | | | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/502 https://github.com/google/protobuf/issues/425
* | | Fix appveyor tests.Feng Xiao2015-06-221-2/+2
| | |
* | | Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-1930-274/+366
|\ \ \ | |/ / |/| | Add nonnull/nullable/null_resettable markup to ObjC library.
| * | Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-1630-274/+366
| | | | | | | | | | | | Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
* | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 18:23:23 +0000