Commit graph

332 commits

Author SHA1 Message Date
jieluo@google.com
4de8f55113 down integrate to svn 2014-07-18 00:47:59 +00:00
liujisi@google.com
c5553a3d18 Down-integrate pending changes from internal repository after previous release. 2014-05-28 21:48:28 +00:00
xiaofeng@google.com
e7f2937962 Fix a bug in Arm64 atomicops. (https://codereview.appspot.com/88800045/) 2014-05-05 22:06:41 +00:00
xiaofeng@google.com
3aa5ea95a9 Fix and improve arm64 atomic operations in protobuf stubs (patch from rmcilroy@).
https://codereview.appspot.com/86030044/
2014-04-09 17:47:59 +00:00
xiaofeng@google.com
2ca19bd806 Add Arm64 AtomicOps (patch from rmcilroy@) 2014-03-26 03:05:53 +00:00
xiaofeng@google.com
a80030eff4 Replace TSan API declarations in atomicops_internals_tsan.h with a header inclusion (patch from glider@) 2014-03-24 18:40:08 +00:00
xiaofeng@google.com
37c7426b47 Replace kEmptyString wth OnceInit initialized string* 2014-02-13 22:09:48 +00:00
liujisi@google.com
f0b6a5cfeb Add aarch64 architecture to platform_macros.h (patch by Sylvain Defresne)
Both gcc and clang defines the __aarch64__ macro when building
for the 64-bit AArch64 execution state of ARMv8 processors, so
use this to detect the architecture.
2014-02-13 19:03:24 +00:00
xiaofeng@google.com
172019c40b Add missing #include of <algorithm> for min/max on VS2013 2013-09-17 21:00:11 +00:00
xiaofeng@google.com
d833126822 Fix a typo. 2013-07-30 18:35:45 +00:00
xiaofeng@google.com
4f68d92cfa Add support for ThreadSanitizer atomicops API to protobuf - patch from glider@ 2013-07-25 19:55:35 +00:00
xiaofeng@google.com
c9f69500b7 Update OSGi meta data. 2013-03-08 00:37:10 +00:00
xiaofeng@google.com
25b2a673ae Fix issue 474 2013-03-05 03:19:15 +00:00
xiaofeng@google.com
7f4c9e860e Add a comment about the new "allow_alias" option. 2013-03-05 01:51:21 +00:00
xiaofeng@google.com
7fe28a8973 Update version number in descriptor.pb.h and plugin.pb.h 2013-03-01 19:39:21 +00:00
xiaofeng@google.com
2c9392f8dd Update version number in trunk 2013-02-28 06:12:28 +00:00
xiaofeng@google.com
a36f1b43e7 Exclude a failing test in MingW build. 2013-02-26 17:49:03 +00:00
xiaofeng@google.com
7f372559cc Down-integrate from internal branch 2013-02-25 10:39:39 +00:00
xiaofeng@google.com
de3494fe5c Fix issue 403, issue 456, issue 462 2013-02-25 10:24:11 +00:00
xiaofeng@google.com
e406747cd5 Fix issue 445, issue 449 2013-02-07 07:00:07 +00:00
xiaofeng@google.com
1e5a5e8419 Down-integrate from internal branch 2013-01-31 15:52:58 +00:00
liujisi@google.com
691f6da30b Rollback the export macros on internal classes/functions. 2013-01-15 02:19:41 +00:00
liujisi@google.com
117064c18b add missing dll export macros for msvc. 2013-01-11 10:35:05 +00:00
liujisi@google.com
71caf8c25d Remove "using" directives to disambiguate type_traits for vc2012. 2013-01-11 06:36:35 +00:00
liujisi@google.com
f5b373dfb6 Fix a typo of nacl file name. 2013-01-10 21:37:04 +00:00
liujisi@google.com
e9ee30962f Add missing qnx files. 2013-01-10 21:28:15 +00:00
liujisi@google.com
4d8c2f94fb Add arm_qnx atomic ops support and add missing header files in Makefile.am 2013-01-10 21:24:56 +00:00
liujisi@google.com
98080e8598 Update upb namespace in friendship declaration. 2013-01-10 21:05:26 +00:00
liujisi@google.com
cb77c4c381 Generate a warning for duplicated enum values, when allow_alias option isn't
set.
2012-12-28 23:41:54 +00:00
liujisi@google.com
4770277ec7 Add the missing PNaCl atomicops support. 2012-12-19 03:46:58 +00:00
liujisi@google.com
728aa760fd Down-integrate form internal opensource branch 2012-12-19 02:37:59 +00:00
xiaofeng@google.com
0b30eb8c87 Fix the name of thread safety macros. 2012-12-13 09:09:32 +00:00
liujisi@google.com
5d701498dd Remove unused macros. 2012-12-10 18:58:26 +00:00
liujisi@google.com
5e6539205e Remove the customized operator delete. 2012-12-10 18:54:03 +00:00
xiaofeng@google.com
a655b98171 Fix issue 438: add missing 'enum_type_wrapper' to setup.py 2012-12-08 18:44:32 +00:00
liujisi@google.com
2273ee403b Add java options to plugin proto and rollback the r450 2012-12-05 23:47:43 +00:00
liujisi@google.com
0c995c9300 Remove undeeded no-rtti guards. 2012-12-05 23:16:07 +00:00
liujisi@google.com
2bee6e66e8 Fix build warnings for gcc 4.6 2012-12-05 22:29:30 +00:00
liujisi@google.com
ed95d54e92 Define macros on more targets to make gtest work for vs2012 2012-12-05 07:02:32 +00:00
liujisi@google.com
6fb956d9db Remove extra semicolons 2012-12-05 06:38:29 +00:00
liujisi@google.com
1e36e1006a Add missing export macro 2012-12-05 06:26:08 +00:00
liujisi@google.com
329d103b3e Set pointers to NULL after shutdown, so the shutdown function can be called for multiple times. 2012-12-05 06:18:10 +00:00
liujisi@google.com
f5d5b4de92 Make custom option able to work for -f-no-rtti; Fix remaining death tests for gtest 1.6 2012-12-05 05:54:48 +00:00
liujisi@google.com
e34f1f63b6 Find the protoc from environ first for python. 2012-12-05 01:25:12 +00:00
liujisi@google.com
8cc2017f34 Quote the AC_LANG_SOURCE to eliminate warnings introduced by autoconf 2.6.8 2012-12-05 00:55:16 +00:00
liujisi@google.com
1d32532ead Update gtest to 1.6; Disable death tests when exceptions are enabled. 2012-12-04 23:32:47 +00:00
liujisi@google.com
e719489061 Make PROTOBUF_USE_EXCEPTIONS configurable from CPPFLAGS. 2012-12-04 22:06:04 +00:00
xiaofeng@google.com
caa66db018 Merge from tags/2.5.0rc1 to trunk 2012-12-04 18:44:24 +00:00
xiaofeng@google.com
eaaef0b39b Fix issues: 342, 424, 428, 430, 436 2012-12-04 00:59:40 +00:00
liujisi@google.com
ef9acc464d Update version to 2.5.0-pre 2012-11-30 22:38:00 +00:00