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

2165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jorge Canizales
249483e93c Document why the podspec is on the root of the repo 2015-06-01 19:55:27 -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
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
Jorge Canizales
0d3b36ad54 Adds objectivec_helpers.h to the headers installed by make. 2015-05-26 10:46:09 -07:00
Feng Xiao
8e1426800e Replace the check of "../.git" 
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.
 2015-05-26 00:11:09 -07:00
Bo Yang
0ac523bfee Add new headers to extract_includes.bat 2015-05-25 22:57:08 -07:00
Bo Yang
51de7a7141 Add new files to Makefile.am 2015-05-25 22:21:05 -07:00
Bo Yang
632e8e26ce Add csharp_EXTRA_DIST to all_EXTRA_DIST. 2015-05-25 20:20:54 -07:00
TeBoring
e9d0bb4aaa Add new files for java runtime to Makefile.am 2015-05-25 20:17:04 -07:00
Feng Xiao
4e0c46f93d Explicitly call destructor of Mutex to release resources. 
Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec
 2015-05-25 19:04:00 -07:00
Feng Xiao
72f17c4367 Make hash_map forward constructor parameters to its base class. 
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
 2015-05-25 18:18:29 -07:00
Bo Yang
9907286855 Add csharp files to Makefile.am 2015-05-25 17:06:18 -07:00
Bo Yang
4edc1bbadf Add objectivec/generate_descriptors_proto.sh in Makefile.am 2015-05-25 16:18:12 -07:00
Bo Yang
a9332e201d Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby 2015-05-25 16:04:36 -07:00
TeBoring
eef79f3ef0 Remove useless slash in Makefile.am 2015-05-25 13:08:09 -07:00
Bo Yang
50a765ba03 Fix bugs in objective-c. 2015-05-25 12:48:03 -07:00
Paul Yang
ad0a5cab52 Merge pull request #422 from google/3.0.0-alpha-3-windows-fix 
3.0.0 alpha 3 windows fix
 2015-05-25 02:02:27 -07:00
Bo Yang
cf603a9dfa Fix bugs on windows. 2015-05-24 23:03:05 -07:00
Paul Yang
3ff9592561 Merge pull request #421 from TeBoring/3.0.0-alpha-3-fix 
Fix c++ on windows
 2015-05-24 15:33:20 -07:00
teboring
b175c72e5b Merge branch '3.0.0-alpha-3-fix' of https://github.com/TeBoring/protobuf into 3.0.0-alpha-3-fix 2015-05-24 15:18:29 -07:00
teboring
8565e1e1ef Add missing files for test to *.vcproj files 2015-05-24 15:17:41 -07:00
Paul Yang
8ee267dda7 Merge pull request #420 from TeBoring/3.0.0-alpha-3-fix 
Fix C2385: ambiguous access to parent classes' member without specifying
 2015-05-24 00:35:56 -07:00
Bo Yang
f87e5b7e74 Fix C2385: accessing parent classes' member without specifying is ambiguous. 2015-05-24 00:13:26 -07:00
teboring
a7393c0b26 Allow csharp to be configured as a language in configure.ac 2015-05-23 23:34:59 -07:00
Paul Yang
bad9071dea Merge pull request #419 from TeBoring/3.0.0-alpha-3-fix 
Add missing files to *.vcproj
 2015-05-23 22:52:55 -07:00
teboring
2e663048e3 Add missing files to *.vcproj 2015-05-23 22:28:49 -07:00
Paul Yang
409b4b483c Merge pull request #418 from TeBoring/3.0.0-alpha-3-fix 
Clean up *.vcproj files
 2015-05-23 19:33:38 -07:00
teboring
4baf49ec70 Clean up *.vcproj files 2015-05-23 18:34:38 -07:00