aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGES.txt to include a bug fix.v2.6.1rc1Feng Xiao2014-10-091-0/+1
|
* Update version number in generated files.Feng Xiao2014-10-092-2/+2
|
* Update CHANGES.txt for 2.6.1rc1.Feng Xiao2014-10-091-0/+17
|
* Merge remote-tracking branch 'origin/master' into 2.6.1Feng Xiao2014-10-092-0/+17
|\
| * Merge pull request #43 from abuszta/bugfixFeng Xiao2014-10-092-0/+17
| |\ | | | | | | Release objects allocated by InitializeDefaultRepeatedFields()
| | * DestroyDefaultRepeatedFields is registered using OnShutdown.Antoni Buszta2014-10-091-3/+1
| | |
| | * InitializeDefaultRepeatedFields() allocates memory but does not release it.Antoni Buszta2014-10-082-0/+19
| | |
* | | Update version number to 2.6.1rc1Feng Xiao2014-10-085-8/+8
|/ /
* | Avoid using the macro name again in macro definitions.Feng Xiao2014-10-081-3/+3
| |
* | Fix the memory leak of GetEmptyString().Feng Xiao2014-10-081-1/+5
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
|
* Merge pull request #35 from dsrosario/fix_warningFeng Xiao2014-10-061-1/+1
|\ | | | | Fix "warning C4018: '<' : signed/unsigned mismatch"
| * Fix "warning C4018: '<' : signed/unsigned mismatch" at wire_format_lite_inl.hDinis Rosário2014-09-231-1/+1
| |
* | Merge pull request #38 from xfxyjwf/fix17Feng Xiao2014-10-032-3/+38
|\ \ | | | | | | Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields.
| * | Update verification methods' names.Feng Xiao2014-10-021-6/+8
| | |
| * | Fix a bug that causes DynamicMessage.setField() to not work for repeatedFeng Xiao2014-10-012-2/+35
| | | | | | | | | | | | enum fields.
* | | Down-integrate from internal branch.Feng Xiao2014-10-033-15/+14
| | |
* | | Merge pull request #39 from xfxyjwf/fix24Feng Xiao2014-10-022-7/+34
|\ \ \ | | | | | | | | Fix descriptor validation logic for packed enum fields.
| * | | Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-012-7/+34
| |/ /
* | | Merge pull request #3 from dhirschfeld/pyext-fixFeng Xiao2014-10-021-0/+1
|\ \ \ | |/ / |/| | Explicitly specify pyext/cpp_message.py in py_modules list
| * | Explicitly specify pyext/cpp_message.py in py_modules listDavid Hirschfeld2014-08-271-0/+1
| | |
* | | Merge pull request #37 from google/fix_linksxfxyjwf2014-10-01398-405/+405
|\ \ \ | | | | | | | | Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers
| * | | Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-01398-405/+405
|/ / / | | | | | | | | | developers.google.com/protocol-buffers
* | | Merge pull request #32 from worr/bug/solaris-atomicopsxfxyjwf2014-09-235-2/+208
|\ \ \ | |_|/ |/| | Add support for solaris atomicops
| * | Update CONTRIBUTORS.txtWilliam Orr2014-09-221-1/+4
| | |
| * | Update copyright notice and remove first lineWilliam Orr2014-09-221-2/+1
| | |
| * | Add support for solaris atomicopsWilliam Orr2014-09-194-1/+205
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #31 from worr/bug/autoconf-sched-yieldxfxyjwf2014-09-221-0/+3
|\ \ \ | |/ / |/| | Add check for sched_yield in librt
| * | Add check for sched_yield in librtWilliam Orr2014-09-191-0/+3
|/ / | | | | | | | | In Solaris, sched_yield lives in librt, rather than libc. This patch adds a check which will link in librt if necessary.
* | Merge pull request #30 from edmonds/branches/fix_generic_atomicops_memory_modelsxfxyjwf2014-09-191-2/+2
|\ \ | | | | | | generic atomicops: promote Acquire_Store() and Release_Load() to use SEQ_CST fence
| * | generic atomicops: promote Acquire_Store() and Release_Load() to use SEQ_CST ↵Robert Edmonds2014-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | Merge pull request #29 from ↵xfxyjwf2014-09-181-0/+2
|\ \ \ | |/ / |/| | | | | | | | edmonds/branches/undef_GOOGLE_PROTOBUF_PLATFORM_ERROR platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer needed
| * | platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer ↵Robert Edmonds2014-09-181-0/+2
| | | | | | | | | | | | needed
* | | Merge pull request #27 from edmonds/branches/fix_generic_atomicops_non_clangxfxyjwf2014-09-182-7/+20
|\| | | | | | | | Fix atomicops build failure on non-Clang
| * | Fix atomicops build failure on non-ClangRobert Edmonds2014-09-182-7/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #21 from edmonds/branches/clang_generic_atomicsxfxyjwf2014-09-182-2/+4
|\ \ | | | | | | Expose generic atomicops on Clang
| * | Expose generic atomicops on ClangRobert S. Edmonds2014-09-132-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #20 from edmonds/branches/no_ppcxfxyjwf2014-09-181-3/+0
|\| | | | | | | | Remove GOOGLE_PROTOBUF_ARCH_PPC
| * | Remove GOOGLE_PROTOBUF_ARCH_PPCRobert S. Edmonds2014-09-131-3/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #15 from google/pom_version_fixJisi Liu2014-09-041-1/+1
|\ \ | | | | | | Bump version for maven-bundle-plugin
| * | Bump version for maven-bundle-pluginJisi Liu2014-09-041-1/+1
|/ /
* | Merge pull request #12 from huahang/patch-2Jisi Liu2014-09-031-1/+1
|\ \ | | | | | | remove a const qualifier in a method's return type
| * | remove a const qualifier in a method's return typehuahang2014-09-041-1/+1
|/ /
* | Merge pull request #8 from huahang/patch-1Jisi Liu2014-09-031-1/+1
|\ \ | | | | | | fix a compile warning
| * | fix a compile warninghuahang2014-09-031-1/+1
|/ / | | | | | | | | This change fixes the following compiler warning: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
* | Merge pull request #1 from dhirschfeld/vs2008-fixxfxyjwf2014-09-021-1/+1
|\ \ | | | | | | Added const qualifier to iterator to enable compiling with VS2008
| * | Added const qualifier to iterator to enable compiling with VS2008David Hirschfeld2014-08-271-1/+1
| |/
* | Rename README.txt to README.mdFeng Xiao2014-08-291-1/+1
| |
* | Merge pull request #5 from google/fix_readmexfxyjwf2014-08-291-17/+20
|\ \ | | | | | | Rename README.txt to README.md and use markdown formatting.
| * | Fix the formating of bold text.Feng Xiao2014-08-281-5/+5
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 02:27:20 +0000