aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | | |
* | | | | Merge pull request #451 from jcanizales/document-why-podspec-is-on-rootFeng Xiao2015-06-021-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Document why the podspec is on the root of the repo
| * | | | | Document why the podspec is on the root of the repoJorge Canizales2015-06-011-0/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #441 from anandolee/masterJan Tattermusch2015-06-0111-302/+677
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | Change the C# enum generator inherit from primitive generator
| * | | Change the C# enum generator inherit from primitive generatorJie Luo2015-05-2911-302/+677
| | | |
* | | | Merge pull request #404 from anandolee/masterJie Luo2015-05-2939-2163/+4720
|\| | | | | | | | | | | Add oneof support for c#
| * | | Add oneof support for C#Jie Luo2015-05-2939-2163/+4720
| | | |
* | | | Add distributionManagement explicitly to prevent maven from usingBo Yang2015-05-292-0/+20
| | | | | | | | | | | | | | | | | | | | default configuration. In default configuration, maven needs webdav for deployment, which cannot be found in central repository.
* | | | Update version number to 3.0.0-alpha-4Bo Yang2015-05-296-6/+6
| | | |
* | | | Modify change logv3.0.0-alpha-3Bo Yang2015-05-281-2/+3
| | | |
* | | | Fixes on visual studio 2008unknown2015-05-278-12/+25
| | | |
* | | | 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
| | | |
* | | | Add 3.0.0-alpha-3 release to CHANGES.txtBo Yang2015-05-261-0/+99
| | | |
* | | | 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.
* | | | Merge pull request #426 from thomasvl/mac_fixup_for_a3_branchPaul Yang2015-05-266-35/+15
|\ \ \ \ | | | | | | | | | | ObjC fixup for the branch.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-16 05:51:39 +0000