Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add back incorrectly excluded cmake targets. | Feng Xiao | 2015-06-05 | 1 | -1/+2 |
| | |||||
* | Merge pull request #460 from haberman/conformance-names | Joshua Haberman | 2015-06-05 | 5 | -60/+235 |
|\ | | | | | Conformance tests can now be excluded based on their names. | ||||
| * | Removed test_name from conformance.proto. | Josh Haberman | 2015-06-04 | 4 | -15/+15 |
| | | | | | | | | Change-Id: I382dcda97fa123a6da4ff5faad5d7ece95853f33 | ||||
| * | Conformance tests can now be excluded based on their names. | Josh Haberman | 2015-06-03 | 6 | -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/master | Jie Luo | 2015-06-04 | 28 | -1647/+1861 |
|\ \ | | | | | | | Migrate writer to printer for C# | ||||
| * | | Migrate writer to io::Printer for C# | Jie Luo | 2015-06-04 | 28 | -1647/+1861 |
| | | | |||||
* | | | Merge pull request #457 from xfxyjwf/cmake | Feng Xiao | 2015-06-04 | 12 | -11/+767 |
|\ \ \ | | | | | | | | | Add cmake support. | ||||
| * | | | Fix README.md formatting. | Feng Xiao | 2015-06-04 | 1 | -34/+43 |
| | | | | | | | | | | | | | | | | Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b | ||||
| * | | | Add an cmake option to exclude tests. | Feng Xiao | 2015-06-04 | 1 | -2/+4 |
| | | | | |||||
| * | | | Add cmake support. | Feng Xiao | 2015-05-31 | 12 | -11/+756 |
| | | | | |||||
* | | | | Merge pull request #456 from xfxyjwf/android | Jisi Liu | 2015-06-04 | 2 | -494/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Remove Android.mk | ||||
| * | | | Remove Android.mk | Feng Xiao | 2015-06-02 | 2 | -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/master | Feng Xiao | 2015-06-03 | 1 | -0/+14 |
|\ \ \ \ | |/ / / |/| | | | Add protoc path detection for Mac OS | ||||
| * | | | Add protoc path detection for Mac OS | Dan Barry | 2015-06-02 | 1 | -0/+14 |
| | | | | |||||
* | | | | Merge pull request #444 from xfxyjwf/vs2010_fix | Feng Xiao | 2015-06-02 | 2 | -9/+9 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Fix two issues on vs2010. | ||||
| * | | Call copy() only if there is something to copy. | Feng Xiao | 2015-05-31 | 1 | -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 Xiao | 2015-05-31 | 1 | -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_fix | Paul Yang | 2015-06-02 | 1 | -8/+19 |
|\ \ \ | | | | | | | | | Add remaining not-already-imported well known types files to podspec | ||||
| * \ \ | Merge pull request #1 from jcanizales/podspec_fix | Michael Lumish | 2015-06-02 | 1 | -7/+19 |
| |\ \ \ | | | | | | | | | | | A few corrections to the proposed podspec | ||||
| | * | | | Reorder fields so it looks like exclude_files affects preserve_paths | Jorge Canizales | 2015-06-02 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Better documentation | Jorge Canizales | 2015-06-02 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Remove backslashes after commas | Jorge Canizales | 2015-06-02 | 1 | -12/+13 |
| | | | | | |||||
| | * | | | Remove struct.proto too (redefines GPBValue) | Jorge Canizales | 2015-06-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | s/pobjc/pbobjc and simplify a bit the podspec | Jorge Canizales | 2015-06-02 | 1 | -3/+14 |
| |/ / / | |||||
| * | | | Ignored files that cause build errors | murgatroid99 | 2015-06-01 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add remaining not-already-imported well known types files to podspec | murgatroid99 | 2015-06-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #305 from ezegomez/master | Feng Xiao | 2015-06-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix unittest in i386 | ||||
| * | | | Fix unittest in i386 | Ezequiel Lara Gomez | 2015-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #451 from jcanizales/document-why-podspec-is-on-root | Feng Xiao | 2015-06-02 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | Document why the podspec is on the root of the repo | ||||
| * | | | | Document why the podspec is on the root of the repo | Jorge Canizales | 2015-06-01 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #441 from anandolee/master | Jan Tattermusch | 2015-06-01 | 11 | -302/+677 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | Change the C# enum generator inherit from primitive generator | ||||
| * | | Change the C# enum generator inherit from primitive generator | Jie Luo | 2015-05-29 | 11 | -302/+677 |
| | | | |||||
* | | | Merge pull request #404 from anandolee/master | Jie Luo | 2015-05-29 | 39 | -2163/+4720 |
|\| | | | | | | | | Add oneof support for c# | ||||
| * | | Add oneof support for C# | Jie Luo | 2015-05-29 | 39 | -2163/+4720 |
| | | | |||||
* | | | Add distributionManagement explicitly to prevent maven from using | Bo Yang | 2015-05-29 | 2 | -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-4 | Bo Yang | 2015-05-29 | 6 | -6/+6 |
| | | | |||||
* | | | Modify change logv3.0.0-alpha-3 | Bo Yang | 2015-05-28 | 1 | -2/+3 |
| | | | |||||
* | | | Fixes on visual studio 2008 | unknown | 2015-05-27 | 8 | -12/+25 |
| | | | |||||
* | | | Replace "\\" with "/" for windows path names. | Feng Xiao | 2015-05-26 | 1 | -0/+4 |
| | | | |||||
* | | | In std11, on mac, operator new doesn't take right reference. | TeBoring | 2015-05-26 | 1 | -1/+1 |
| | | | |||||
* | | | Add 3.0.0-alpha-3 release to CHANGES.txt | Bo Yang | 2015-05-26 | 1 | -0/+99 |
| | | | |||||
* | | | Merge pull request #430 from xfxyjwf/std11_fix | Paul Yang | 2015-05-26 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | Make MapAllocator work with C++11. | ||||
| * | | | Make MapAllocator work with C++11. | Feng Xiao | 2015-05-26 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | Change-Id: I0e1d9e248403631cb57ebed5231e85d19b9bb3df | ||||
* | | | | Merge pull request #429 from xfxyjwf/std11_fix | Paul Yang | 2015-05-26 | 1 | -6/+0 |
|\| | | | | | | | | | | | Remove std::is_trivially_default_constructible. | ||||
| * | | | Remove std::is_trivially_default_constructible. | Feng Xiao | 2015-05-26 | 1 | -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 to | Bo Yang | 2015-05-26 | 1 | -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 arena | Bo Yang | 2015-05-26 | 1 | -5/+5 |
| | | | | | | | | | | | | allocator to allocate memory twice for uint64. | ||||
* | | | Merge pull request #426 from thomasvl/mac_fixup_for_a3_branch | Paul Yang | 2015-05-26 | 6 | -35/+15 |
|\ \ \ | | | | | | | | | ObjC fixup for the branch. | ||||
| * | | | ObjC fixup for the branch. | Thomas Van Lenten | 2015-05-26 | 6 | -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 Xiao | 2015-05-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Change-Id: I85675bfcd7697bb058b9af475445a6bfdd7fd967 |