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

2202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Austin Schuh
fd73235f6b Refactored threadlocal logic. 
Refactored the threadlocal logic for Android and IOS into logic in
platform_macro.h which computes a GOOGLE_PROTOBUF_NO_THREADLOCAL
define which is then used elsewhere.  This allows new platforms
without THREADLOCAL to be easily defined.
 2015-06-08 18:49:16 -07:00
Feng Xiao
9cbdaedb86 Exclude 3 failing tests on osx from travis. 2015-06-08 13:00:45 -07:00
Feng Xiao
872beb738b Merge pull request #469 from xfxyjwf/vsprojects 
Remove vsprojects.
 2015-06-08 12:21:49 -07:00
Feng Xiao
3f9be70d06 Merge pull request #361 from brianduff/sync_aosp 
Speed up little endian int/long writes.
 2015-06-06 00:44:39 -07:00
Feng Xiao
b9baa47eaf Merge pull request #468 from AustinSchuh/unsigned_proto 
Marked another compiler literal unsigned.
 2015-06-06 00:40:51 -07:00
Feng Xiao
f51f1b7bb6 Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE 
Fixed bug in GOOGLE_PREDICT_FALSE.
 2015-06-06 00:39:12 -07:00
Feng Xiao
ee6b3d5529 Remove vsprojects. 2015-06-05 23:57:01 -07:00
Feng Xiao
dffd542bb8 Update ./update_file_lists.sh. 
Make it executable and generate extract_includes.bat in the same directory.
 2015-06-05 23:36:05 -07:00
Austin Schuh
307af628e6 Marked another compiler literal unsigned. 
When compiling a protobuf with gcc 4.1.2 for powerpc, I ran into
another of the following warning message:

INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc:
bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member
   function `virtual void MyProto::Clear()':
   bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this
      decimal constant is unsigned only in ISO C90

The line in the proto file that was triggering it was:

  if (_has_bits_[24 / 32] & 4278190080) {
    ZR_(field1_, field2_);
  }

_has_bits_ is a uint32.  The constant mask should therefore be
unsigned.  This change updates the constant to be generated as
unsigned.
 2015-06-05 22:46:01 -07:00
Feng Xiao
e9839ff444 Add back incorrectly excluded cmake targets. 2015-06-05 21:24:23 -07:00
Austin Schuh
f4c8627edb Fixed bug in GOOGLE_PREDICT_FALSE. 
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.
 2015-06-05 18:49:25 -07:00
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