Commit Graph

314 Commits

Author SHA1 Message Date
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
xiaofeng@google.com
9c1c31ff16 Fix compile issues under GCC 3.4.6 2012-11-30 16:29:03 +00:00
xiaofeng@google.com
d2d50f9a73 Fix Java compile issues under JDK 1.5 2012-11-30 16:26:07 +00:00
xiaofeng@google.com
a4491ea142 Fix issue 412: update protobuf for 64-bit compatibility on Mac OS X - patch from Mark Mentovai 2012-11-14 13:38:10 +00:00
xiaofeng@google.com
a058718f7a Fix issue 298: add OSGi configuration to pom.xml - patch from Thomas Kock 2012-10-25 06:21:08 +00:00
pliard@google.com
75575df086 Generate missing inclusion of common.h.
FileGenerator::GenerateBuildDescriptors() emits
"::google::protobuf::internal::OnShutdown(&$shutdownfilename$);" which is
declared in common.h.

Although Protobuf is very well tested a compilation error was triggered while
rolling Protobuf r423:426. There might be something wrong in the Chromium roll
(still in progress).

It seems safer anyway not to rely on indirect headers inclusion.
2012-10-02 00:15:46 +00:00
xiaofeng@google.com
3d46dad1d2 Use string::size_type instead of int for results of string.find() etc. -- patch from hans 2012-09-27 09:04:02 +00:00
xiaofeng@google.com
fcb8a50b50 Update MSVC project files and fix compilation issues in MSVC. 2012-09-24 06:48:20 +00:00
xiaofeng@google.com
b55a20fa2c Down-integrate from internal branch 2012-09-22 02:40:50 +00:00
liujisi@google.com
9ced30caf9 Down-integration form opensource depot 2012-08-01 06:22:19 +00:00
pliard@google.com
daced74d77 Add support for NaCl in atomicops.
This does additionally a significant cleanup in platform_macros.h (initially
pulled from v8).
It implemented some subtleties that we don't use like the HOST/TARGET arch
distinction.

Changes related to NaCl support come from Chromium's build/build_config.h.

BUG=392
2012-07-17 15:51:05 +00:00
liujisi@google.com
d0e03932c1 Fix issue/333. skip any escaped characters in quotes. 2012-07-13 06:03:42 +00:00
liujisi@google.com
d2967cda0e -lz in protobuf.pc belongs in Libs.private, not Libs 2012-07-03 09:52:54 +00:00
liujisi@google.com
42e3b666ef set _VARDADIC_MAX=10 preprocessor definition to make test pass in vc11. 2012-07-03 09:47:02 +00:00
liujisi@google.com
26261eb756 Allow configure to disable maintainer mode 2012-07-03 09:39:26 +00:00
liujisi@google.com
e7881e8e12 Update atomicops to support new platforms where intptr_t = long.
Fix license headers.
2012-06-05 17:02:25 +00:00
liujisi@google.com
aabd7cf8f8 Fix a NULL/bool conversion. 2012-05-17 04:59:53 +00:00
xiaofeng@google.com
2072421124 Fix issue 378 2012-05-16 05:41:31 +00:00
pliard@google.com
a269a2c48b Update outdated use of GoogleOnceType. 2012-05-10 08:04:04 +00:00