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

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
dac016786a Move protobuf 2.3.0 to prebuilts. 
This will facilitate an upgrade to 2.6.0 and future versions without
breaking applications which have a hardcoded dependency on 2.3.0. The
existing make rules have been renamed to omit the version code.

The prebuilts were built from a tree at commit
9be7e7401174d75e87e21fdc5f43549594a714bb.

Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
 2014-10-22 10:00:30 -07:00
Feng Xiao
df5481c6b3 Update version number to 2.6.2-pre. 2014-10-21 16:47:33 -07:00
Feng Xiao
f9e623b167 Merge changes from 2.6.1 release branch. 2014-10-21 16:36:59 -07:00
Feng Xiao
bba83652e1 Update version number to 2.6.1. 2014-10-20 17:06:06 -07:00
John Beard
2853cd4a10 Add .gitignore file 
Includes files generated by each of:
   * autogen.sh
   * configure
   * make
 2014-10-16 12:57:15 +01:00
Dwayne Litzenberger
b460610b69 Omit google-apputils dependency under Python 3 
Temporary change until a py3k-compatible google-apputils is released.
 2014-10-14 13:50:52 -07:00
Dwayne Litzenberger
0fd260eae7 Use 2to3 when building under Python 3. 2014-10-14 13:47:11 -07:00
William Orr
20e0a61ff6 Don't test for sched_yield on Windows 2014-10-10 22:50:39 -07:00
Feng Xiao
419c94b6e0 Update CHANGES.txt to include a bug fix. 2014-10-09 11:40:02 -07:00
Feng Xiao
8c12b1af76 Update version number in generated files. 2014-10-09 11:31:47 -07:00
Feng Xiao
57b86729f2 Update CHANGES.txt for 2.6.1rc1. 2014-10-09 11:20:08 -07:00
Feng Xiao
5ac39f34ae Merge remote-tracking branch 'origin/master' into 2.6.1 2014-10-09 10:27:01 -07:00
Feng Xiao
5452bd6e39 Merge pull request #43 from abuszta/bugfix 
Release objects allocated by InitializeDefaultRepeatedFields()
 2014-10-09 10:25:47 -07:00
Antoni Buszta
e670b67032 DestroyDefaultRepeatedFields is registered using OnShutdown. 2014-10-09 07:16:04 +02:00
Feng Xiao
d9d1da95c6 Update version number to 2.6.1rc1 2014-10-08 18:44:37 -07:00
Feng Xiao
3b8dadf581 Avoid using the macro name again in macro definitions. 2014-10-08 17:32:53 -07:00
Feng Xiao
06e6690bf2 Fix the memory leak of GetEmptyString(). 2014-10-08 17:28:03 -07:00
Antoni Buszta
e83ba13a6f InitializeDefaultRepeatedFields() allocates memory but does not release it. 2014-10-08 11:27:18 +02:00
Feng Xiao
0971bb0d57 Down-integrate from internal branch. 2014-10-07 17:44:48 -07:00
Feng Xiao
c1d16457db Merge pull request #35 from dsrosario/fix_warning 
Fix "warning C4018: '<' : signed/unsigned mismatch"
 2014-10-06 14:12:21 -07:00
Feng Xiao
56aa52d986 Merge pull request #38 from xfxyjwf/fix17 
Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields.
 2014-10-03 11:24:42 -07:00
Feng Xiao
84731a111f Down-integrate from internal branch. 2014-10-03 11:14:13 -07:00
Brian Duff
4d6e9c5f6d am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode." 
* commit '9be7e7401174d75e87e21fdc5f43549594a714bb':
  Change reftypes_primitive_enums to reftypes_compat_mode.
 2014-10-03 16:53:35 +00:00
Feng Xiao
725326f1ee Update verification methods' names. 2014-10-02 17:46:39 -07:00
Feng Xiao
0dd3fef843 Merge pull request #39 from xfxyjwf/fix24 
Fix descriptor validation logic for packed enum fields.
 2014-10-02 17:40:47 -07:00
Feng Xiao
eb223ed4f7 Merge pull request #3 from dhirschfeld/pyext-fix 
Explicitly specify pyext/cpp_message.py in py_modules list
 2014-10-02 15:55:32 -07:00
Brian Duff
188a2d6f5e Merge "Change reftypes_primitive_enums to reftypes_compat_mode." 2014-10-02 22:51:35 +00:00
Feng Xiao
f5691a617e Fix descriptor validation logic for packed enum fields. 2014-10-01 18:26:48 -07:00
Feng Xiao
345d49a51e Fix a bug that causes DynamicMessage.setField() to not work for repeated 
enum fields.
 2014-10-01 17:31:28 -07:00
xfxyjwf
6147768171 Merge pull request #37 from google/fix_links 
Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers
 2014-10-01 16:52:35 -07:00
Feng Xiao
e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers 2014-10-01 16:26:23 -07:00
Brian Duff
7fbf654004 Change reftypes_primitive_enums to reftypes_compat_mode. 
Make the clear() method stripped in reftypes_compat_mode.

Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
 2014-10-01 12:55:00 -07:00
Brian Duff
50a024fbe1 am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes." 
* commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d':
  Adds a primitive enum mode for reftypes.
 2014-10-01 15:11:16 +00:00
Brian Duff
517591b8ea Merge "Adds a primitive enum mode for reftypes." 2014-10-01 15:02:26 +00:00
Brian Duff
a892068c2d Adds a primitive enum mode for reftypes. 
This is a compatibility shim.

Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
 2014-09-30 10:57:50 -07:00
xfxyjwf
a9155b8d3c Merge pull request #32 from worr/bug/solaris-atomicops 
Add support for solaris atomicops
 2014-09-23 10:48:02 -07:00
Dinis Rosário
bb7d210c2a Fix "warning C4018: '<' : signed/unsigned mismatch" at wire_format_lite_inl.h 2014-09-23 14:03:46 +01:00
William Orr
195f01719e Update CONTRIBUTORS.txt 2014-09-22 22:20:36 -07:00
William Orr
a27b329084 Update copyright notice and remove first line 2014-09-22 11:53:54 -07:00
xfxyjwf
a48c08aa9a Merge pull request #31 from worr/bug/autoconf-sched-yield 
Add check for sched_yield in librt
 2014-09-22 10:02:11 -07:00
William Orr
2d7786cfc3 Add support for solaris atomicops 
This patch adds support for atomic operations on Solaris, on any platform.
It makes use of the atomic functions made available in Solaris' atomic.h
header.
 2014-09-19 22:04:23 -07:00
William Orr
38b8494647 Add check for sched_yield in librt 
In Solaris, sched_yield lives in librt, rather than libc. This patch adds a
check which will link in librt if necessary.
 2014-09-19 21:54:27 -07:00
xfxyjwf
7d50120316 Merge pull request #30 from edmonds/branches/fix_generic_atomicops_memory_models 
generic atomicops: promote Acquire_Store() and Release_Load() to use SEQ_CST fence
 2014-09-19 12:00:58 -07:00
Robert Edmonds
cc0a047384 generic atomicops: promote Acquire_Store() and Release_Load() to use SEQ_CST fence 
__atomic_store_n() cannot take a memory model argument of
__ATOMIC_ACQUIRE, and __atomic_load_n() cannot take a memory model
argument of __ATOMIC_RELEASE, per the GCC documentation:

    https://gcc.gnu.org/onlinedocs/gcc-4.9.1/gcc/_005f_005fatomic-Builtins.html

On Clang this generates a -Watomic-memory-ordering warning.

Promote the fences in Acquire_Store() and Release_Load() to the stronger
__ATOMIC_SEQ_CST memory model, which ought to be safe.

Note that there are no actual uses of Acquire_Store() or Release_Load()
in protobuf, though.

This follows the TSAN atomicops implementation, which also uses SEQ_CST
fences for these functions.

(Fixes #25.)
 2014-09-18 20:36:42 -04:00
xfxyjwf
dce98a8d4c Merge pull request #29 from edmonds/branches/undef_GOOGLE_PROTOBUF_PLATFORM_ERROR 
platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer needed
 2014-09-18 17:31:23 -07:00
Robert Edmonds
0a3e36f1bf platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer needed 2014-09-18 20:24:30 -04:00
xfxyjwf
8d5f1e1efb Merge pull request #27 from edmonds/branches/fix_generic_atomicops_non_clang 
Fix atomicops build failure on non-Clang
 2014-09-18 17:19:19 -07:00
Robert Edmonds
7432af823a Fix atomicops build failure on non-Clang 
We cannot use Clang's __has_extension macro unless we really are
compiling on Clang, which means we cannot use this expression:

    #if (defined(__clang__) && __has_extension(c_atomic)))
    // ...
    #endif

On GCC, this generates the following errors:

    In file included from ./google/protobuf/stubs/atomicops.h:59:0,
                     from google/protobuf/stubs/atomicops_internals_x86_gcc.cc:36:
    ./google/protobuf/stubs/platform_macros.h:67:41: error: missing binary operator before token "("
       (defined(__clang__) && __has_extension(c_atomic)))
                                             ^
    In file included from google/protobuf/stubs/atomicops_internals_x86_gcc.cc:36:0:
    ./google/protobuf/stubs/atomicops.h:196:40: error: missing binary operator before token "("
      (defined(__clang__) && __has_extension(c_atomic))
                                            ^

Instead, we have to protect the __has_extension expression by only
executing it when __clang__ is defined:

    #if defined(__clang__)
    # if __has_extension(c_atomic)
    // ...
    # endif
    #endif
 2014-09-18 18:36:00 -04:00
xfxyjwf
5c8ab2cbb3 Merge pull request #21 from edmonds/branches/clang_generic_atomics 
Expose generic atomicops on Clang
 2014-09-18 13:52:31 -07:00
xfxyjwf
7b6c5d58a8 Merge pull request #20 from edmonds/branches/no_ppc 
Remove GOOGLE_PROTOBUF_ARCH_PPC
 2014-09-18 13:51:56 -07:00