diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 18:13:37 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 18:13:37 +0000 |
| commit | 58e851d6e4095006c6622fdc468e1d8a728e0392 (patch) | |
| tree | c7eb6b809db4ebc0f8b58e44e9c766bb7c99f001 /third_party | |
| parent | a0ef52110d388f80a54594f2811051c725a27359 (diff) | |
| download | chromium_src-58e851d6e4095006c6622fdc468e1d8a728e0392.zip chromium_src-58e851d6e4095006c6622fdc468e1d8a728e0392.tar.gz chromium_src-58e851d6e4095006c6622fdc468e1d8a728e0392.tar.bz2 | |
Cherry pick r512 from upstream protobuf
Fixes compilation on VS2013.
TBR=cpu@chromium.org
BUG=288498
Review URL: https://codereview.chromium.org/27017004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/protobuf/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 50c39c0..f9f90e2b 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -27,6 +27,7 @@ targets that depend on it can be componentized. See http://crbug.com/172800 for details, and r179806 for the patch. Revision 504 was cherry-picked from upstream. +Revision 512 was cherry-picked from upstream. Notes about Java: We have not forked the Java version of protobuf-lite, so the Java version does diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc index f552e1f..b3a71ce 100644 --- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc +++ b/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc @@ -36,6 +36,8 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/stl_util.h> +#include <algorithm> + namespace google { namespace protobuf { namespace io { |