toolkit/components/protobuf/vs2013.patch@129ffea94266
toolkit/components/protobuf/vs2013.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
1 diff --git a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
2 --- a/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
3 +++ b/toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
4 @@ -31,16 +31,17 @@
5 // Author: kenton@google.com (Kenton Varda)
6 // wink@google.com (Wink Saville) (refactored from wire_format.h)
7 // Based on original Protocol Buffers design by
8 // Sanjay Ghemawat, Jeff Dean, and others.
10 #ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
11 #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
13 +#include <algorithm>
14 #include <string>
15 #include <google/protobuf/stubs/common.h>
16 #include <google/protobuf/message_lite.h>
17 #include <google/protobuf/repeated_field.h>
18 #include <google/protobuf/wire_format_lite.h>
19 #include <google/protobuf/generated_message_util.h>
20 #include <google/protobuf/io/coded_stream.h>
