aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
...
* | | Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MINGravatar Feng Xiao2014-11-17
|\ \ \ | | | | | | | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
| * | | Use 'kint32min'/'kint32max' constants, rather than defining locally.Gravatar Tres Seaver2014-11-17
| | | | | | | | | | | | | | | | | | | | Incorporates feedback from @xfxyjwf: https://github.com/google/protobuf/pull/84#discussion_r20474781.
| * | | Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.Gravatar Tres Seaver2014-11-17
| | | | | | | | | | | | | | | | | | | | | | | | Define safe constants to use when padding enums. Fixes #80.
| | | * Report a warning if the proto file doesn't have a syntax statement.Gravatar Feng Xiao2014-11-14
| |_|/ |/| |
* | | Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|/ /
* | Merge pull request #69 from apaprocki/aix-atomicopsGravatar Feng Xiao2014-11-11
|\ \ | | | | | | Add AIX/POWER atomicops and fix compilation with IBM xlC C++ compiler.
| * | Modify tests to compile on AIX with xlC compiler.Gravatar Andrew Paprocki2014-11-11
| | | | | | | | | | | | | | | - `int64` typedef collision with `sys/inttypes.h` - `xlC` complains about `int` and pointer comparisons without casts
| * | Add atomicops for AIX/POWER + IBM xlC compiler.Gravatar Andrew Paprocki2014-11-11
| | |
* | | Merge branch 'typofixes-vlajos-20141108' of ↵Gravatar Feng Xiao2014-11-11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| | | |
| * | | typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/ / /
* | | Adds more checks before deleting temporary files.Gravatar Feng Xiao2014-11-08
| | |
* | | Merge pull request #71 from abyss7/masterGravatar Feng Xiao2014-11-05
|\ \ \ | | | | | | | | Silence -Wsign-compare warning on Mac
* \ \ \ Merge pull request #70 from AustinSchuh/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ | | | | | | | | | | Fixed Unused Parameter warning in headers.
* \ \ \ \ Merge pull request #72 from Steelskin/masterGravatar Feng Xiao2014-11-05
|\ \ \ \ \ | | | | | | | | | | | | Change references to `vector` to use `std::vector`
* | | | | | Corrected code example in coded_stream.hGravatar acidtonic2014-11-04
| | | | | | | | | | | | | | | | | | There is an example at the top of the page which contains code that appears to show a user how to create and serialize a message to a file. However the flags to open the file lack the O_CREAT flag which allows creating the file if it doesn't exist. I was troubleshooting a situation where this snippet was used and compiled, but never created a file.
| * | | | | Change references to `vector` to use `std::vector`Gravatar Fabrice de Gans-Riberi2014-11-03
|/ / / / / | | | | | | | | | | | | | | | | | | | | Upstreaming patch used by Chromium in https://codereview.chromium.org/693773003/
| | * / / Silence -Wsign-compare warning on MacGravatar abyss72014-11-03
| |/ / / |/| | |
| * | | Fixed Unused Parameter warning in compiler headers.Gravatar Austin Schuh2014-10-31
| | | |
| * | | Fixed Unused Parameter warning in headers.Gravatar Austin Schuh2014-10-31
|/ / /
| * / Fixed IBM xlC compiler error due to missing prefix.Gravatar Andrew Paprocki2014-10-31
|/ /
* | Add the missing solaris atomics header file.Gravatar Feng Xiao2014-10-22
| |
* | Update version number to 2.6.2-pre.Gravatar Feng Xiao2014-10-21
| |
* | Update version number in generated files.Gravatar Feng Xiao2014-10-09
| |
* | Merge remote-tracking branch 'origin/master' into 2.6.1Gravatar Feng Xiao2014-10-09
|\ \
| * \ Merge pull request #43 from abuszta/bugfixGravatar Feng Xiao2014-10-09
| |\ \ | | | | | | | | Release objects allocated by InitializeDefaultRepeatedFields()
| | * | DestroyDefaultRepeatedFields is registered using OnShutdown.Gravatar Antoni Buszta2014-10-09
| | | |
* | | | Update version number to 2.6.1rc1Gravatar Feng Xiao2014-10-08
|/ / /
* | | Avoid using the macro name again in macro definitions.Gravatar Feng Xiao2014-10-08
| | |
* | | Fix the memory leak of GetEmptyString().Gravatar Feng Xiao2014-10-08
| | |
| * | InitializeDefaultRepeatedFields() allocates memory but does not release it.Gravatar Antoni Buszta2014-10-08
|/ /
* | Merge pull request #35 from dsrosario/fix_warningGravatar Feng Xiao2014-10-06
|\ \ | | | | | | Fix "warning C4018: '<' : signed/unsigned mismatch"
* | | Down-integrate from internal branch.Gravatar Feng Xiao2014-10-03
| | |
* | | Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | | | | | | | | | developers.google.com/protocol-buffers
| | * Change reftypes_primitive_enums to reftypes_compat_mode.Gravatar Brian Duff2014-10-01
| | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
| | * Adds a primitive enum mode for reftypes.Gravatar Brian Duff2014-09-30
| | | | | | | | | | | | | | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
| * | Fix "warning C4018: '<' : signed/unsigned mismatch" at wire_format_lite_inl.hGravatar Dinis Rosário2014-09-23
| | |
* | | Update copyright notice and remove first lineGravatar William Orr2014-09-22
| | |
* | | Add support for solaris atomicopsGravatar William Orr2014-09-19
|/ / | | | | | | | | | | 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 #30 from edmonds/branches/fix_generic_atomicops_memory_modelsGravatar xfxyjwf2014-09-19
|\ \ | | | | | | 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 ↵Gravatar Robert Edmonds2014-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer ↵Gravatar Robert Edmonds2014-09-18
|/ / | | | | | | needed
* | Fix atomicops build failure on non-ClangGravatar Robert Edmonds2014-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Includes a MessageNano subclass's name's hashCode in hashCode calculations.Gravatar Jason Neufeld2014-09-16
| | | | | | | | | | | | | | | | | | | | 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>
* | Expose generic atomicops on ClangGravatar Robert S. Edmonds2014-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Remove GOOGLE_PROTOBUF_ARCH_PPCGravatar Robert S. Edmonds2014-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | remove a const qualifier in a method's return typeGravatar huahang2014-09-04
| |
* | fix a compile warningGravatar huahang2014-09-03
| | | | | | | | | | This change fixes the following compiler warning: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
* | Added const qualifier to iterator to enable compiling with VS2008Gravatar David Hirschfeld2014-08-27
| |
* | merge tags/2.6.0 into trunkGravatar jieluo@google.com2014-08-25
| |