aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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.
| * | | ObjC fixup for the branch.Thomas Van Lenten2015-05-266-35/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar
* | | | Null-terminate C strings.Feng Xiao2015-05-261-1/+2
| | | | | | | | | | | | | | | | Change-Id: I85675bfcd7697bb058b9af475445a6bfdd7fd967
* | | | Merge pull request #424 from ↵Paul Yang2015-05-262-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | jcanizales/make-objc-helpers-available-to-other-plugins Adds objectivec_helpers.h to the headers installed by make.
| * | | Add ObjC helpers header to vsproject/extract_includes.batJorge Canizales2015-05-261-0/+1
| | | |
| * | | Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
|/ / /
* | | Replace the check of "../.git"Feng Xiao2015-05-261-25/+24
| | | | | | | | | | | | | | | | | | | | | Checking the existence of ".git" is not the right way to check whether we are in develop environment because we distribute source tar-balls where such a ".git" directory does not exist. Replaced it with checking .proto files.
* | | Add new headers to extract_includes.batBo Yang2015-05-251-2/+16
| | |
* | | Add new files to Makefile.amBo Yang2015-05-251-1/+32
| | |
* | | Add csharp_EXTRA_DIST to all_EXTRA_DIST.Bo Yang2015-05-251-1/+1
| | |
* | | Add new files for java runtime to Makefile.amTeBoring2015-05-251-0/+3
| | |
* | | Explicitly call destructor of Mutex to release resources.Feng Xiao2015-05-251-1/+5
| | | | | | | | | | | | Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec
* | | Make hash_map forward constructor parameters to its base class.Feng Xiao2015-05-251-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | We use a custom allocator for map fields and this allocator must be passed correctly to hash_map to make sure it's allocated properly with our custom allocator. Change-Id: Ie59fa24bf11ff28ffd0fa870e24e456c66b2b9c5
* | | Add csharp files to Makefile.amBo Yang2015-05-251-0/+249
| | |
* | | Add objectivec/generate_descriptors_proto.sh in Makefile.amBo Yang2015-05-251-0/+1
| | |
* | | Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in ↵Bo Yang2015-05-254-7/+150
| | | | | | | | | | | | src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-12 04:21:13 +0000