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.)
michael@0 | 1 | Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc |
michael@0 | 2 | =================================================================== |
michael@0 | 3 | --- src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 511) |
michael@0 | 4 | +++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 512) |
michael@0 | 5 | @@ -36,6 +36,8 @@ |
michael@0 | 6 | #include <google/protobuf/stubs/common.h> |
michael@0 | 7 | #include <google/protobuf/stubs/stl_util.h> |
michael@0 | 8 | |
michael@0 | 9 | +#include <algorithm> |
michael@0 | 10 | + |
michael@0 | 11 | namespace google { |
michael@0 | 12 | namespace protobuf { |
michael@0 | 13 | namespace io { |