Bug 892856 - Protobuf fails to build in VS 2013. r=mmc
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 05 Nov 2013 15:54:30 +0900
changeset 153523 c7c4e8463dc3ce5f12c05385f690a5d5dc777b7e
parent 153522 13469e0250a33d1d6e3354e40ce3cd837f696bcd
child 153524 ed57804472ee8a81b40f28bbdbf015cc74ef33b3
push id35818
push userm_kato@ga2.so-net.ne.jp
push dateTue, 05 Nov 2013 06:54:43 +0000
treeherdermozilla-inbound@c7c4e8463dc3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmmc
bugs892856
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 892856 - Protobuf fails to build in VS 2013. r=mmc
toolkit/components/protobuf/README.txt
toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
toolkit/components/protobuf/r512.patch
toolkit/components/protobuf/update.sh
--- a/toolkit/components/protobuf/README.txt
+++ b/toolkit/components/protobuf/README.txt
@@ -4,8 +4,13 @@ Protocol Buffers (protobuf) source is av
 svn checkout http://protobuf.googlecode.com/svn/trunk/ protobuf-read-only
 
 This code is covered under the BSD license (see COPYING.txt). Documentation is
 available at http://code.google.com/p/protobuf.
 
 This import includes only files in protobuf-lite, a lighter-weight library that
 does not support reflection or descriptors. Manual changes include removing all
 tests, testdata, config.h, and all files not used in protobuf-lite.
+
+Applied Patches
+===============
+r512.patch:
+  Support VS2013 (from revision r512)
--- a/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
+++ b/toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
@@ -31,16 +31,18 @@
 // Author: kenton@google.com (Kenton Varda)
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/stubs/stl_util-inl.h>
 
+#include <algorithm>
+
 namespace google {
 namespace protobuf {
 namespace io {
 
 namespace {
 
 // Default block size for Copying{In,Out}putStreamAdaptor.
 static const int kDefaultBlockSize = 8192;
new file mode 100644
--- /dev/null
+++ b/toolkit/components/protobuf/r512.patch
@@ -0,0 +1,13 @@
+Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+===================================================================
+--- src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 511)
++++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 512)
+@@ -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 {
new file mode 100644
--- /dev/null
+++ b/toolkit/components/protobuf/update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+patch -p1 < r512.patch