Bug 892856 - Protobuf fails to build in VS 2013. r=mmc

This commit is contained in:
Makoto Kato 2013-11-05 15:54:30 +09:00
parent 611eff9757
commit 2669485799
4 changed files with 22 additions and 0 deletions

View File

@ -9,3 +9,8 @@ available at http://code.google.com/p/protobuf.
This import includes only files in protobuf-lite, a lighter-weight library that This import includes only files in protobuf-lite, a lighter-weight library that
does not support reflection or descriptors. Manual changes include removing all does not support reflection or descriptors. Manual changes include removing all
tests, testdata, config.h, and all files not used in protobuf-lite. tests, testdata, config.h, and all files not used in protobuf-lite.
Applied Patches
===============
r512.patch:
Support VS2013 (from revision r512)

View File

@ -36,6 +36,8 @@
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
#include <google/protobuf/stubs/stl_util-inl.h> #include <google/protobuf/stubs/stl_util-inl.h>
#include <algorithm>
namespace google { namespace google {
namespace protobuf { namespace protobuf {
namespace io { namespace io {

View File

@ -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 {

View File

@ -0,0 +1,2 @@
#!/bin/sh
patch -p1 < r512.patch