Index: branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h
===================================================================
--- branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h	(nonexistent)
+++ branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h	(revision 523846)
@@ -0,0 +1,20 @@
+--- third_party/snappy/src/snappy.h.orig	2020-01-22 18:43:16 UTC
++++ third_party/snappy/src/snappy.h
+@@ -73,7 +73,7 @@ namespace snappy {
+   // Original contents of *output are lost.
+   //
+   // REQUIRES: "input[]" is not an alias of "*output".
+-  size_t Compress(const char* input, size_t input_length, string* output);
++  size_t Compress(const char* input, size_t input_length, std::string* output);
+ 
+   // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed".
+   // Original contents of "*uncompressed" are lost.
+@@ -82,7 +82,7 @@ namespace snappy {
+   //
+   // returns false if the message is corrupted and could not be decompressed
+   bool Uncompress(const char* compressed, size_t compressed_length,
+-                  string* uncompressed);
++                  std::string* uncompressed);
+ 
+   // Decompresses "compressed" to "*uncompressed".
+   //

Property changes on: branches/2020Q1/www/chromium/files/patch-third__party_snappy_src_snappy.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 523845)
+++ branches/2020Q1	(revision 523846)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r523845