Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Issue 10793026: Roll Protobuf r415:r423. (Closed)

Created:
8 years, 5 months ago by Philippe
Modified:
8 years, 4 months ago
Reviewers:
Nico, liujisi
CC:
chromium-reviews
Visibility:
Public.

Description

Roll Protobuf r415:r423. 1) Got an upstream diff 415:423 from svn 2) Applied 3) Updated protobuf.gyp Changelog: r423 Add support for NaCl in atomicops. r422 Fix issue/333. skip any escaped characters in quotes. r421 -lz in protobuf.pc belongs in Libs.private, not Libs r420 set _VARDADIC_MAX=10 preprocessor definition to make test pass in vc11. r419 Allow configure to disable maintainer mode r418 Update atomicops to support new platforms where intptr_t = long. r417 Fix a NULL/bool conversion. r416 Fix issue 378 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148557

Patch Set 1 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+273 lines, -551 lines) Patch
M third_party/protobuf/README.chromium View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/protobuf.gyp View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/Makefile.am View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor.pb.cc View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops.h View 4 chunks +53 lines, -30 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h View 1 chunk +10 lines, -7 lines 0 comments Download
A third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h View 1 chunk +122 lines, -0 lines 0 comments Download
A + third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_macosx.h View 3 chunks +13 lines, -93 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h View 1 chunk +10 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.h View 1 chunk +10 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc View 1 chunk +1 line, -1 line 0 comments Download
D third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_macosx.h View 1 chunk +0 lines, -304 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h View 1 chunk +10 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc View 1 chunk +10 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/platform_macros.h View 2 chunks +24 lines, -82 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
Philippe
8 years, 5 months ago (2012-07-18 07:56:20 UTC) #1
Nico
LGTM stamp If you're in the mood, you could include a small changelog in the ...
8 years, 5 months ago (2012-07-20 17:25:44 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pliard@chromium.org/10793026/4002
8 years, 4 months ago (2012-07-26 11:53:37 UTC) #3
commit-bot: I haz the power
Try job failure for 10793026-4002 (retry) on linux_rel for step "browser_tests". It's a second try, ...
8 years, 4 months ago (2012-07-26 12:51:24 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pliard@chromium.org/10793026/4002
8 years, 4 months ago (2012-07-26 13:37:41 UTC) #5
commit-bot: I haz the power
8 years, 4 months ago (2012-07-26 16:06:44 UTC) #6
Change committed as 148557

Powered by Google App Engine
This is Rietveld 408576698