Commit Graph

298 Commits

Author SHA1 Message Date
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
pliard@google.com
6103d4ed13 Don't call AddDesc() at static init time in LITE_RUNTIME mode.
This patch makes the generation of StaticDescriptorInitializer_$filename$
depend on whether LITE_RUNTIME is enabled. Note that this works only when
extensions are not used.

This lets us significantly decrease the number of static initializers generated
by protoc in LITE_RUNTIME mode (used in Chromium).
In LITE_RUNTIME mode, $adddescriptorsname$() is called the first time that
default_instance() is called (rather than being called during static init).

To benefit from this patch in LITE_RUNTIME mode without extensions, compile
with -DGOOGLE_PROTOBUF_NO_STATIC_INIT.

BUG=351
2012-05-04 11:16:09 +00:00
pliard@google.com
7cc257673c Improve GoogleOnceInit() in Protocol Buffers.
It is based on V8's new CallOnce(): http://codereview.chromium.org/9447052/.

This patch includes the following changes:
  - POD (no static initializer generated) and faster implementation on Windows.
  - GoogleOnceInit() can now take an additional parameter which is forwarded to
    the function provided by the user.

This patch is part of the static initializers removal initiative.
2012-04-10 08:15:18 +00:00
pliard@google.com
6a10204df6 Add missing guard in atomicops MSVC cc file 2012-03-08 14:27:30 +00:00
pliard@google.com
72afe6ee3f Fix build error in Mac atomicops. 2012-03-06 08:20:45 +00:00
pliard@google.com
324779ad70 Remove static initializer in wire_format_lite.cc. 2012-03-02 14:00:20 +00:00
pliard@google.com
f5de486b53 Add atomicops from V8. 2012-03-02 13:04:36 +00:00
liujisi@google.com
cb6dd4ef5f A workaround for MSVC 2010 x64 platform bug,
which affects proto compiler in generating field has_bit mask.
2011-07-05 21:05:40 +00:00
liujisi@google.com
2a89d0022d Add missing dll export macros. 2011-07-05 17:16:07 +00:00
liujisi@google.com
f36ae07c58 Update external gtest to 1.5.0. 2011-07-05 09:35:11 +00:00
liujisi@google.com
295a096023 Remove extra semicolon in primitive repeated field init code. 2011-07-05 06:16:40 +00:00
liujisi@google.com
5325de1808 Support for C-style comments in editors/proto.vim -- patch from infnty. 2011-07-05 04:52:47 +00:00
liujisi@google.com
3239fec94c Close resources properly for java tests and examples. 2011-06-07 03:51:33 +00:00
liujisi@google.com
e8e6eed0be Fixed a memory leak in python CPP implementation. 2011-06-07 03:38:28 +00:00
liujisi@google.com
7a6de0008a Update comments for globally unique extension number for custom options. 2011-05-25 06:25:24 +00:00
liujisi@google.com
02d7015ba8 Allow String to be used as message names. 2011-05-04 06:15:22 +00:00
liujisi@google.com
5c24564811 Update mainline version to 2.4.2-pre. 2011-05-03 07:06:03 +00:00