Bug 892856 - Fix protobuf to build with VS2013 v2. r=mmc
authorXavier Fung <xavier114fch@gmail.com>
Sat, 18 Jan 2014 02:17:51 +0900
changeset 164087 011815b28db278c9f4b9bf8f336aec8e9f36d73e
parent 164086 524b5b1776473bdcac482305fcea310d69b2c7de
child 164088 6f7227918e79f66e1e7ba3f2733a113411f0ea58
push id26026
push userphilringnalda@gmail.com
push dateSat, 18 Jan 2014 23:17:27 +0000
treeherdermozilla-central@61fd0f987cf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmmc
bugs892856
milestone29.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 - Fix protobuf to build with VS2013 v2. r=mmc
toolkit/components/protobuf/README.txt
toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
toolkit/components/protobuf/vs2013.patch
--- a/toolkit/components/protobuf/README.txt
+++ b/toolkit/components/protobuf/README.txt
@@ -9,8 +9,11 @@ available at http://code.google.com/p/pr
 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)
+
+vs2013.patch
+  Additional changes to support VS2013 missed from revision r512.
--- a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
+++ b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
@@ -31,16 +31,17 @@
 // Author: kenton@google.com (Kenton Varda)
 //         wink@google.com (Wink Saville) (refactored from wire_format.h)
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
 #ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
 #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
 
+#include <algorithm>
 #include <string>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/message_lite.h>
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/wire_format_lite.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/io/coded_stream.h>
 
new file mode 100644
--- /dev/null
+++ b/toolkit/components/protobuf/vs2013.patch
@@ -0,0 +1,21 @@
+diff --git a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
+--- a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
++++ b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
+@@ -31,16 +31,17 @@
+ // Author: kenton@google.com (Kenton Varda)
+ //         wink@google.com (Wink Saville) (refactored from wire_format.h)
+ //  Based on original Protocol Buffers design by
+ //  Sanjay Ghemawat, Jeff Dean, and others.
+ 
+ #ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
+ #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
+ 
++#include <algorithm>
+ #include <string>
+ #include <google/protobuf/stubs/common.h>
+ #include <google/protobuf/message_lite.h>
+ #include <google/protobuf/repeated_field.h>
+ #include <google/protobuf/wire_format_lite.h>
+ #include <google/protobuf/generated_message_util.h>
+ #include <google/protobuf/io/coded_stream.h>
+