From 9f1702fcfd12d85625e4406702fc39716bf55bca Mon Sep 17 00:00:00 2001
From: "glider@chromium.org"
 <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 12 Aug 2013 08:59:46 +0000
Subject: Update protobuf to r428, part 1.

This has been done by:
 - patching third_party/protobuf with the upstream diff for r423:426 and r428 (427 has already been cherrypicked)
 - manually applying the rejected hunks in the following files:
      src/google/protobuf/wire_format.cc
      src/google/protobuf/wire_format_lite.h
      src/google/protobuf/unknown_field_set.cc
      src/google/protobuf/descriptor.pb.h
      src/google/protobuf/extension_set.cc
      src/google/protobuf/wire_format_lite.cc
      src/google/protobuf/descriptor.pb.cc
      src/google/protobuf/wire_format.h
      src/google/protobuf/compiler/plugin.pb.h
      src/google/protobuf/compiler/cpp/cpp_helpers.h
      src/google/protobuf/compiler/cpp/cpp_file.cc
      vsprojects/lite-test.vcproj.rej
      vsprojects/libprotobuf-lite.vcproj.rej
      vsprojects/libprotobuf.vcproj.rej
      vsprojects/tests.vcproj.rej
      vsprojects/extract_includes.bat.rej
 - adding the new cc/h files to protobuf.gyp and disabling MSVC warning C4291
 - rebuilding descriptor.pb.{cc,h} using the upstream protoc r425
 - fixing compilation (replaced WireFormat with WireFormatLite where applicable)
 - cherry-picking the upstream r505
 - applying patch from https://code.google.com/p/protobuf/issues/detail?id=539

To reduce the changelist size, some of the test files were excluded.
They will be committed separately: https://codereview.chromium.org/21231003

BUG=259808
TBR=agl@chromium.org, pliard@google.com

Review URL: https://codereview.chromium.org/21208003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216961 0039d316-1c4b-4281-b951-d872f2087c98
---
 third_party/protobuf/vsprojects/extract_includes.bat | 1 +
 1 file changed, 1 insertion(+)

(limited to 'third_party/protobuf/vsprojects')

diff --git a/third_party/protobuf/vsprojects/extract_includes.bat b/third_party/protobuf/vsprojects/extract_includes.bat
index 70fdf73..4dcb4e1 100755
--- a/third_party/protobuf/vsprojects/extract_includes.bat
+++ b/third_party/protobuf/vsprojects/extract_includes.bat
@@ -17,6 +17,7 @@ copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.p
 copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h
 copy ..\src\google\protobuf\dynamic_message.h include\google\protobuf\dynamic_message.h
 copy ..\src\google\protobuf\extension_set.h include\google\protobuf\extension_set.h
+copy ..\src\google\protobuf\generated_enum_reflection.h include\google\protobuf\generated_enum_reflection.h
 copy ..\src\google\protobuf\generated_message_util.h include\google\protobuf\generated_message_util.h
 copy ..\src\google\protobuf\generated_message_reflection.h include\google\protobuf\generated_message_reflection.h
 copy ..\src\google\protobuf\message.h include\google\protobuf\message.h
-- 
cgit v1.1