Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc
2 ===================================================================
3 --- src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 511)
4 +++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 512)
5 @@ -36,6 +36,8 @@
6 #include <google/protobuf/stubs/common.h>
7 #include <google/protobuf/stubs/stl_util.h>
9 +#include <algorithm>
10 +
11 namespace google {
12 namespace protobuf {
13 namespace io {