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

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Duff
7d8185c963 am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations." 
* commit 'd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc':
  Includes a MessageNano subclass's name's hashCode in hashCode calculations.
 2014-09-17 07:34:13 +00:00
Brian Duff
14e2f6cb37 Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations." 2014-09-17 07:13:40 +00:00
Jason Neufeld
87bd4029cf Includes a MessageNano subclass's name's hashCode in hashCode calculations. 
In the current implementation, a message with the same amount of null or
equal-valued fields as a different message type will have the same
hashCode. This adds more variety by including the hashCode of the
class's name in the hashCode calculations.

Change-Id: I284e3e6d198ad8037815948d1f65686465ffd623
Signed-off-by: Jason Neufeld <jneufeld@google.com>
 2014-09-16 18:40:11 -07:00
Robert S. Edmonds
628a23ba8d Expose generic atomicops on Clang 
The generic atomicops implementation is only exposed if GCC >= 4.7 is
available, but Clang, where the underlying __atomic built-ins are also
available, typically only claims to be GCC 4.2. This causes build
failures when compiling protobuf or the output of protoc's C++ code
generator on an architecture that needs the generic atomicops
implementation with Clang.

Clang has a "c_atomic" extension which can be tested for which almost
does what we want:

    C11 atomic operations

    Use __has_feature(c_atomic) or __has_extension(c_atomic) to
    determine if support for atomic types using _Atomic is enabled.
    Clang also provides a set of builtins which can be used to implement
    the <stdatomic.h> operations on _Atomic types.

I'm not sure if this guarantees that the GNU atomic builtins (the ones
with the __atomic prefix) are also available, but in practice this
should guarantee that Clang is new enough.

With this change in place, Clang generates several diagnostics when
compiling the generic atomicops implementation. These appear to be bugs
in the generic atomicops implementation and are not Clang-specific.
 2014-09-13 20:59:39 -04:00
Robert S. Edmonds
d24b987c14 Remove GOOGLE_PROTOBUF_ARCH_PPC 
The macro GOOGLE_PROTOBUF_ARCH_PPC is not used anywhere in the protobuf
source; there is no Power-specific atomics implementation, etc.

Funnily enough, the macro __ppc__ is not actually defined on 32-bit
Power on GCC/Linux, according to the following webpage:

    http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros#POWER

and verified on a 32-bit Debian sid 'powerpc' chroot:

    (sid_powerpc-dchroot)edmonds@partch:~$ gcc -dM -E - < /dev/null | grep -c __ppc__
    0
    (sid_powerpc-dchroot)edmonds@partch:~$ gcc -dM -E - < /dev/null | grep -c __LP64__
    0
 2014-09-13 19:31:12 -04:00
Jisi Liu
edc5994525 Merge pull request #15 from google/pom_version_fix 
Bump version for maven-bundle-plugin
 2014-09-04 15:37:28 -07:00
Jisi Liu
ec0c9e4a03 Bump version for maven-bundle-plugin 2014-09-04 10:38:40 -07:00
Jisi Liu
9faecf7e93 Merge pull request #12 from huahang/patch-2 
remove a const qualifier in a method's return type
 2014-09-03 22:30:50 -07:00
huahang
c871fb9384 remove a const qualifier in a method's return type 2014-09-04 10:51:57 +08:00
Jisi Liu
1392f42d1b Merge pull request #8 from huahang/patch-1 
fix a compile warning
 2014-09-03 18:02:28 -07:00
Brian Duff
6c82acd0c8 am c4e7b92f: Merge "Make the tag field public." 
* commit 'c4e7b92fefce5b069f50659363c8878612303510':
  Make the tag field public.
 2014-09-03 19:59:15 +00:00
Brian Duff
e1458bba77 Merge "Make the tag field public." 2014-09-03 18:22:26 +00:00
huahang
27fcf9bff6 fix a compile warning 
This change fixes the following compiler warning:

warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 2014-09-03 15:08:45 +08:00
Brian Duff
5a9b4501db Make the tag field public. 
Change-Id: Ibfda5bb1ac3150ea90d82a152730be76a2f8bf71
 2014-09-02 20:53:34 -07:00
Brian Duff
5db346f1ef am ddf016d8: Merge "Add MessageNano.messageNanoEquals()." 
* commit 'ddf016d828d928eefbce89c602c323bf0f998574':
  Add MessageNano.messageNanoEquals().
 2014-09-02 22:41:55 +00:00
Brian Duff
553d39f9d8 Merge "Add MessageNano.messageNanoEquals()." 2014-09-02 22:25:40 +00:00
Brian Duff
72881dad55 Add MessageNano.messageNanoEquals(). 
Allows two messages to be compared directly for equality without
generating an equals method for every generated message.

(Ports CL58125010)

Change-Id: I92ab5088539d1fd722fee7b5e28a8c825926c3b6
 2014-09-02 22:24:21 +00:00
xfxyjwf
6890263c89 Merge pull request #1 from dhirschfeld/vs2008-fix 
Added const qualifier to iterator to enable compiling with VS2008
 2014-09-02 10:39:16 -07:00
Feng Xiao
aa51f2a38a Rename README.txt to README.md 2014-08-29 17:27:24 -07:00
xfxyjwf
d36778243b Merge pull request #5 from google/fix_readme 
Rename README.txt to README.md and use markdown formatting.
 2014-08-29 10:40:28 -07:00
Max Cai
80241687af am 0068978c: Merge "Fixed octal printing of bytearrays" 
* commit '0068978c364173b15a9cb8ab65fb2d2eac17f136':
  Fixed octal printing of bytearrays
 2014-08-29 15:47:23 +00:00
Max Cai
9d9cb7c330 Merge "Fixed octal printing of bytearrays" 2014-08-29 15:30:31 +00:00
Max Cai
be60c85171 am 77866143: Merge "Revert "Fixed octal printing of bytearrays"" 
* commit '77866143340f7541180d91fa316071ce947b3a8d':
  Revert "Fixed octal printing of bytearrays"
 2014-08-29 11:39:06 +00:00
Max Cai
a609653bd3 am 238e0ac5: Merge "Fixed octal printing of bytearrays" 
* commit '238e0ac56654afadb5270264660db7305f139c02':
  Fixed octal printing of bytearrays
 2014-08-29 11:39:06 +00:00
Linus Tufvesson
2d60e102fa Fixed octal printing of bytearrays 
- Now with 50% less '&' and 100% fewer build breakages!

Change-Id: Icf0283220f75cd14b8564b51bd55973e5b7da56b
 2014-08-29 11:25:48 +01:00
Feng Xiao
b168d1fd1d Fix the formating of bold text. 2014-08-28 14:42:44 -07:00
Feng Xiao
17007a6c47 Update README.md to markdown format. 2014-08-28 14:39:49 -07:00
Feng Xiao
bc72de8ea0 Rename README.txt to README.md 2014-08-28 14:11:28 -07:00
Jisi Liu
0068a929ed Merge pull request #4 from google/fix_readme 
Add instructions on how to generate the configure script.
 2014-08-28 11:32:49 -07:00
Max Cai
2b69e07cf3 Merge "Revert "Fixed octal printing of bytearrays"" 2014-08-28 18:19:36 +00:00
Feng Xiao
de00052be7 Add instructions on how to generate the configure script. 2014-08-28 11:18:51 -07:00
Max Cai
42da25e969 Revert "Fixed octal printing of bytearrays" 
This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806.

Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a
 2014-08-28 18:18:46 +00:00
Max Cai
04f70ef5c7 Merge "Fixed octal printing of bytearrays" 2014-08-28 17:28:22 +00:00
Linus Tufvesson
32a45d0921 Fixed octal printing of bytearrays 
Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94
 2014-08-28 16:20:02 +01:00
David Hirschfeld
ef6eff20bd Explicitly specify pyext/cpp_message.py in py_modules list 2014-08-27 09:25:26 +01:00
David Hirschfeld
b7ec1a95d2 Added const qualifier to iterator to enable compiling with VS2008 2014-08-27 09:10:00 +01:00
Feng Xiao
e9c00d9dd0 Rename COPYING.txt to LICENSE for opensource compliance and update links 
in README.txt.
 2014-08-26 16:16:00 -07:00
jieluo@google.com
a21bf2e646 merge 2.6.0 to trunk 2014-08-25 23:26:40 +00:00
jieluo@google.com
1eba9d9c74 merge tags/2.6.0 into trunk 2014-08-25 20:17:53 +00:00
Max Cai
274705a916 am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 
* commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':
 2014-08-21 17:56:48 +00:00
Max Cai
1dad0f2307 am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 
* commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':
 2014-08-21 17:56:48 +00:00
Ying Wang
08dd6049ee am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 
* commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':
 2014-08-21 17:56:47 +00:00
Baligh Uddin
c64af59b6f am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 
* commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':
 2014-08-21 17:56:46 +00:00
Wink Saville
944f597185 am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 
* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':
 2014-08-21 17:56:46 +00:00
Wink Saville
df60b2505d am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 
* commit '8add9962a5c88ff307d573be91bb091a2b14568d':
 2014-08-21 17:56:45 +00:00
Jan-Willem Maarse
c430d41033 am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 
* commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':
 2014-08-21 17:56:45 +00:00
Bill Yi
c1a565c4d0 am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 
* commit '7f3f30e96965e7189430e4acc53520275627264c':
 2014-08-21 17:56:44 +00:00
Jeff Davidson
d777adae82 am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 
* commit '7bf587289933768ada48e79cf43deecfad65c576':
 2014-08-21 17:56:44 +00:00
Max Cai
6745fbb9ea am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 
* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':
 2014-08-21 17:56:43 +00:00
Max Cai
2e738aa77c am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 
* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':
 2014-08-21 17:56:43 +00:00