AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,190 Commits 35 Branches 138 Tags 124 MiB
68975a4e50
Commit Graph

2190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Haberman
68975a4e50 Merge pull request #460 from haberman/conformance-names 
Conformance tests can now be excluded based on their names.
 2015-06-05 14:50:34 -07:00
Jie Luo
8fe039a69a Merge pull request #462 from anandolee/master 
Migrate writer to printer for C#
 2015-06-04 16:15:23 -07:00
Josh Haberman
23bf3b566f Removed test_name from conformance.proto. 
Change-Id: I382dcda97fa123a6da4ff5faad5d7ece95853f33
 2015-06-04 15:04:00 -07:00
Feng Xiao
42f109d7bc Merge pull request #457 from xfxyjwf/cmake 
Add cmake support.
 2015-06-04 13:35:45 -07:00
Jie Luo
90da3514cd Migrate writer to io::Printer for C# 2015-06-04 11:39:13 -07:00
Feng Xiao
2286ab328c Fix README.md formatting. 
Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
 2015-06-04 11:28:19 -07:00
Jisi Liu
60c510a381 Merge pull request #456 from xfxyjwf/android 
Remove Android.mk
 2015-06-04 08:40:18 -07:00
Feng Xiao
34448fca45 Add an cmake option to exclude tests. 2015-06-04 01:27:19 -07:00
Josh Haberman
d2b67389b3 Conformance tests can now be excluded based on their names. 
This allows us to enable conformance tests even when we know
that some tests are failing and need to be fixed.

Change-Id: I372f43663008747db6f2b2cf06e6ffa4c6d85b2d
 2015-06-03 12:08:08 -07:00
Feng Xiao
96f1d4ada2 Merge pull request #453 from bakineggs/master 
Add protoc path detection for Mac OS
 2015-06-03 11:20:08 -07:00
Feng Xiao
b866d3c727 Remove Android.mk 
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).
 2015-06-02 22:04:45 -07:00
Feng Xiao
dbcfc5e202 Merge pull request #444 from xfxyjwf/vs2010_fix 
Fix two issues on vs2010.
 2015-06-02 21:32:41 -07:00
Dan Barry
0af3ed5189 Add protoc path detection for Mac OS 2015-06-02 17:11:35 -07:00
Paul Yang
4644f99d1a Merge pull request #447 from murgatroid99/podspec_fix 
Add remaining not-already-imported well known types files to podspec
 2015-06-02 16:03:38 -07:00
Feng Xiao
69433f3810 Merge pull request #305 from ezegomez/master 
Fix unittest in i386
 2015-06-02 10:53:03 -07:00
Feng Xiao
d1281cdb69 Merge pull request #451 from jcanizales/document-why-podspec-is-on-root 
Document why the podspec is on the root of the repo
 2015-06-02 10:30:26 -07:00
Michael Lumish
8cbb4cf1b3 Merge pull request #1 from jcanizales/podspec_fix 
A few corrections to the proposed podspec
 2015-06-02 08:34:43 -07:00
Jorge Canizales
9d6b946a9e Reorder fields so it looks like exclude_files affects preserve_paths 2015-06-02 01:03:03 -07:00
Jorge Canizales
e55a25c086 Better documentation 2015-06-02 00:42:40 -07:00
Jorge Canizales
d377c17b34 Remove backslashes after commas 2015-06-02 00:42:40 -07:00
Jorge Canizales
6afcaf0f2d Remove struct.proto too (redefines GPBValue) 2015-06-02 00:42:40 -07:00
Jorge Canizales
153d61a1a1 s/pobjc/pbobjc and simplify a bit the podspec 2015-06-02 00:42:40 -07:00
Jorge Canizales
249483e93c Document why the podspec is on the root of the repo 2015-06-01 19:55:27 -07:00
murgatroid99
bba6d76daa Ignored files that cause build errors 2015-06-01 17:21:02 -07:00
Jan Tattermusch
ad174e0391 Merge pull request #441 from anandolee/master 
Change the C# enum generator inherit from primitive generator
 2015-06-01 12:31:18 -07:00
murgatroid99
df4012ad51 Add remaining not-already-imported well known types files to podspec 2015-06-01 11:31:11 -07:00
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00
Feng Xiao
93d6838ab5 Call copy() only if there is something to copy. 
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).
 2015-05-31 00:15:55 -07:00
Feng Xiao
5a9be2c6f6 Fix MapAllocator::destroy() bug. 
destroy() should always call the destructor because the caller may rely on
the destructor to do clean-ups.
 2015-05-31 00:14:23 -07:00
Jie Luo
a21a2cf7d3 Change the C# enum generator inherit from primitive generator 2015-05-29 18:07:18 -07:00
Jie Luo
802e1848ad Merge pull request #404 from anandolee/master 
Add oneof support for c#
 2015-05-29 17:19:46 -07:00
Bo Yang
252daef02b Add distributionManagement explicitly to prevent maven from using 
default configuration. In default configuration, maven needs webdav for
deployment, which cannot be found in central repository.
 2015-05-29 16:32:04 -07:00
Jie Luo
f7b417ddfe Add oneof support for C# 2015-05-29 13:29:30 -07:00
Bo Yang
e107e2d68e Update version number to 3.0.0-alpha-4 2015-05-29 11:00:57 -07:00
Bo Yang
3e2c8a5dd7 Modify change log 2015-05-28 14:52:44 -07:00
unknown
ca1c252923 Fixes on visual studio 2008 2015-05-27 17:33:10 -07:00
Feng Xiao
b11d6fe515 Replace "\\" with "/" for windows path names. 2015-05-26 21:33:46 -07:00
TeBoring
9250fbaead In std11, on mac, operator new doesn't take right reference. 2015-05-26 15:50:06 -07:00
Bo Yang
8908cf16fe Add 3.0.0-alpha-3 release to CHANGES.txt 2015-05-26 14:38:17 -07:00
Paul Yang
850fe8bfc6 Merge pull request #430 from xfxyjwf/std11_fix 
Make MapAllocator work with C++11.
 2015-05-26 14:38:10 -07:00
Feng Xiao
bdd105d978 Make MapAllocator work with C++11. 
Change-Id: I0e1d9e248403631cb57ebed5231e85d19b9bb3df
 2015-05-26 14:34:53 -07:00
Paul Yang
1b540d5729 Merge pull request #429 from xfxyjwf/std11_fix 
Remove std::is_trivially_default_constructible.
 2015-05-26 14:24:59 -07:00
Bo Yang
83d334f713 When doing make distcheck, a src/google/protobuf/compiler/ruby is created to 
put built libraries. This directory hides the one that contains
ruby_generated_code.proto and ruby_generated_code.rb.
 2015-05-26 14:13:53 -07:00
Feng Xiao
da0afba8f8 Remove std::is_trivially_default_constructible. 
This type_traits is only added after g++ 5.1.0 but we need to support g++ 4+.
 2015-05-26 13:54:47 -07:00
Bo Yang
3a5455b34b uint64 has non-trivial destructor on 32-bit windows. This cause arena 
allocator to allocate memory twice for uint64.
 2015-05-26 13:12:16 -07:00
Paul Yang
cdd5b3b84b Merge pull request #426 from thomasvl/mac_fixup_for_a3_branch 
ObjC fixup for the branch.
 2015-05-26 12:46:25 -07:00
Feng Xiao
621bf82065 Null-terminate C strings. 
Change-Id: I85675bfcd7697bb058b9af475445a6bfdd7fd967
 2015-05-26 11:40:37 -07:00
Thomas Van Lenten
58cd4a47e8 ObjC fixup for the branch. 
- 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
 2015-05-26 14:01:54 -04:00
Paul Yang
973bec13b3 Merge pull request #424 from jcanizales/make-objc-helpers-available-to-other-plugins 
Adds objectivec_helpers.h to the headers installed by make.
 2015-05-26 11:01:26 -07:00
Jorge Canizales
7e53cf7789 Add ObjC helpers header to vsproject/extract_includes.bat 2015-05-26 10:47:30 -07:00