summaryrefslogtreecommitdiffstats
path: root/third_party/re2/patches
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 14:41:53 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 14:41:53 +0000
commitd8fb409a85648b47348d3aed3c1db89db3981f0b (patch)
tree3740f9ed1ff04355b58db346b7ccf1486002f3e7 /third_party/re2/patches
parentd8415ad900d21b08c678bc7b06b2e81581311f71 (diff)
downloadchromium_src-d8fb409a85648b47348d3aed3c1db89db3981f0b.zip
chromium_src-d8fb409a85648b47348d3aed3c1db89db3981f0b.tar.gz
chromium_src-d8fb409a85648b47348d3aed3c1db89db3981f0b.tar.bz2
Migrate WebRequestRedirectByRegExAction to use RE2 and roll RE2 to revision 97:401ab4168e8e
This is a relanding of https://chromiumcodereview.appspot.com/10826120/ after RE2 has been fixed upstream to contain no static initializers. TBR=yoz@chromium.org BUG=112155 Review URL: https://chromiumcodereview.appspot.com/10873029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/re2/patches')
-rw-r--r--third_party/re2/patches/fix-implicit-conversion.patch2
-rw-r--r--third_party/re2/patches/re2-android.patch25
-rw-r--r--third_party/re2/patches/re2-msvc9-chrome.patch1140
-rw-r--r--third_party/re2/patches/remove-posix-option.patch24
-rw-r--r--third_party/re2/patches/remove-valgrind-code.patch21
5 files changed, 155 insertions, 1057 deletions
diff --git a/third_party/re2/patches/fix-implicit-conversion.patch b/third_party/re2/patches/fix-implicit-conversion.patch
index ab6c2f0..bc68f11 100644
--- a/third_party/re2/patches/fix-implicit-conversion.patch
+++ b/third_party/re2/patches/fix-implicit-conversion.patch
@@ -1,7 +1,7 @@
diff -r e12d4aa8907f re2/dfa.cc
--- a/re2/dfa.cc Wed Jul 25 15:13:19 2012 +0200
+++ b/re2/dfa.cc Wed Jul 25 15:13:47 2012 +0200
-@@ -1736,7 +1736,7 @@
+@@ -1778,7 +1780,7 @@
return false;
}
if (params.start == DeadState)
diff --git a/third_party/re2/patches/re2-android.patch b/third_party/re2/patches/re2-android.patch
index a622035..bcaea8d 100644
--- a/third_party/re2/patches/re2-android.patch
+++ b/third_party/re2/patches/re2-android.patch
@@ -1,6 +1,7 @@
-diff -r cae1910ce3c5 re2/parse.cc
---- a/re2/parse.cc Mon Jul 30 16:12:46 2012 +0200
-+++ b/re2/parse.cc Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/re2/parse.cc b/third_party/re2/re2/parse.cc
+index 0cf4ab4..6423fe9 100644
+--- a/third_party/re2/re2/parse.cc
++++ b/third_party/re2/re2/parse.cc
@@ -16,6 +16,8 @@
// and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
// See regexp.h for rationale.
@@ -10,9 +11,10 @@ diff -r cae1910ce3c5 re2/parse.cc
#include "util/util.h"
#include "re2/regexp.h"
#include "re2/stringpiece.h"
-diff -r cae1910ce3c5 re2/re2.cc
---- a/re2/re2.cc Mon Jul 30 16:12:46 2012 +0200
-+++ b/re2/re2.cc Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
+index 989add6..78978f1 100644
+--- a/third_party/re2/re2/re2.cc
++++ b/third_party/re2/re2/re2.cc
@@ -9,6 +9,8 @@
#include "re2/re2.h"
@@ -22,9 +24,10 @@ diff -r cae1910ce3c5 re2/re2.cc
#include <stdio.h>
#include <string>
#ifdef WIN32
-diff -r cae1910ce3c5 util/util.h
---- a/util/util.h Mon Jul 30 16:12:46 2012 +0200
-+++ b/util/util.h Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
+index dab7e16..11b5f4a 100644
+--- a/third_party/re2/util/util.h
++++ b/third_party/re2/util/util.h
@@ -28,6 +28,7 @@
#include <utility>
#include <set>
@@ -33,7 +36,7 @@ diff -r cae1910ce3c5 util/util.h
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
// Use std names.
-@@ -44,7 +45,7 @@
+@@ -44,7 +45,7 @@ using std::sort;
using std::swap;
using std::make_pair;
@@ -42,7 +45,7 @@ diff -r cae1910ce3c5 util/util.h
#include <tr1/unordered_set>
using std::tr1::unordered_set;
-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ using std::tr1::unordered_set;
#else
#include <unordered_set>
diff --git a/third_party/re2/patches/re2-msvc9-chrome.patch b/third_party/re2/patches/re2-msvc9-chrome.patch
index 2d9ed28..17da0cd 100644
--- a/third_party/re2/patches/re2-msvc9-chrome.patch
+++ b/third_party/re2/patches/re2-msvc9-chrome.patch
@@ -1,6 +1,7 @@
-diff -r c79416ca4228 AUTHORS
---- a/AUTHORS Tue May 29 11:50:48 2012 -0400
-+++ b/AUTHORS Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/AUTHORS b/third_party/re2/AUTHORS
+index 3c0f928..e17d9bf 100644
+--- a/third_party/re2/AUTHORS
++++ b/third_party/re2/AUTHORS
@@ -8,5 +8,6 @@
# Please keep the list sorted.
@@ -8,20 +9,23 @@ diff -r c79416ca4228 AUTHORS
+Brian Gunlogson <unixman83@gmail.com>
Google Inc.
Stefano Rivera <stefano.rivera@gmail.com>
-diff -r c79416ca4228 CONTRIBUTORS
---- a/CONTRIBUTORS Tue May 29 11:50:48 2012 -0400
-+++ b/CONTRIBUTORS Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/CONTRIBUTORS b/third_party/re2/CONTRIBUTORS
+index ac64332..15053eb 100644
+--- a/third_party/re2/CONTRIBUTORS
++++ b/third_party/re2/CONTRIBUTORS
@@ -26,6 +26,7 @@
# Please keep the list sorted.
+Brian Gunlogson <unixman83@gmail.com>
+ Dominic Battré <battre@chromium.org>
Rob Pike <r@google.com>
Russ Cox <rsc@swtch.com>
- Sanjay Ghemawat <sanjay@google.com>
-diff -r c79416ca4228 mswin/stdint.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mswin/stdint.h Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/mswin/stdint.h b/third_party/re2/mswin/stdint.h
+new file mode 100644
+index 0000000..d02608a
+--- /dev/null
++++ b/third_party/re2/mswin/stdint.h
@@ -0,0 +1,247 @@
+// ISO C9x compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
@@ -270,383 +274,11 @@ diff -r c79416ca4228 mswin/stdint.h
+
+
+#endif // _MSC_STDINT_H_ ]
-diff -r c79416ca4228 re2.sln
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/re2.sln Wed Jun 20 19:00:08 2012 +0200
-@@ -0,0 +1,38 @@
-+
-+Microsoft Visual Studio Solution File, Format Version 10.00
-+# Visual Studio 2008
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2", "re2.vcproj", "{494BD4B2-1ADD-4053-981D-BA14D6DF9219}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {AB36233A-643A-4D2E-93B3-0602DA52C8D5} = {AB36233A-643A-4D2E-93B3-0602DA52C8D5}
-+ EndProjectSection
-+EndProject
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2_testing", "re2_testing\re2_testing.vcproj", "{1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {494BD4B2-1ADD-4053-981D-BA14D6DF9219} = {494BD4B2-1ADD-4053-981D-BA14D6DF9219}
-+ EndProjectSection
-+EndProject
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{AB36233A-643A-4D2E-93B3-0602DA52C8D5}"
-+EndProject
-+Global
-+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
-+ Debug|Win32 = Debug|Win32
-+ Release|Win32 = Release|Win32
-+ EndGlobalSection
-+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
-+ {494BD4B2-1ADD-4053-981D-BA14D6DF9219}.Debug|Win32.ActiveCfg = Debug|Win32
-+ {494BD4B2-1ADD-4053-981D-BA14D6DF9219}.Debug|Win32.Build.0 = Debug|Win32
-+ {494BD4B2-1ADD-4053-981D-BA14D6DF9219}.Release|Win32.ActiveCfg = Release|Win32
-+ {494BD4B2-1ADD-4053-981D-BA14D6DF9219}.Release|Win32.Build.0 = Release|Win32
-+ {1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}.Debug|Win32.ActiveCfg = Debug|Win32
-+ {1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}.Debug|Win32.Build.0 = Debug|Win32
-+ {1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}.Release|Win32.ActiveCfg = Release|Win32
-+ {1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}.Release|Win32.Build.0 = Release|Win32
-+ {AB36233A-643A-4D2E-93B3-0602DA52C8D5}.Debug|Win32.ActiveCfg = Debug|Win32
-+ {AB36233A-643A-4D2E-93B3-0602DA52C8D5}.Debug|Win32.Build.0 = Debug|Win32
-+ {AB36233A-643A-4D2E-93B3-0602DA52C8D5}.Release|Win32.ActiveCfg = Release|Win32
-+ {AB36233A-643A-4D2E-93B3-0602DA52C8D5}.Release|Win32.Build.0 = Release|Win32
-+ EndGlobalSection
-+ GlobalSection(SolutionProperties) = preSolution
-+ HideSolutionNode = FALSE
-+ EndGlobalSection
-+EndGlobal
-diff -r c79416ca4228 re2.vcproj
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/re2.vcproj Wed Jun 20 19:00:08 2012 +0200
-@@ -0,0 +1,327 @@
-+<?xml version="1.0" encoding="Windows-1252"?>
-+<VisualStudioProject
-+ ProjectType="Visual C++"
-+ Version="9.00"
-+ Name="re2"
-+ ProjectGUID="{494BD4B2-1ADD-4053-981D-BA14D6DF9219}"
-+ RootNamespace="re2"
-+ Keyword="Win32Proj"
-+ TargetFrameworkVersion="196613"
-+ >
-+ <Platforms>
-+ <Platform
-+ Name="Win32"
-+ />
-+ </Platforms>
-+ <ToolFiles>
-+ </ToolFiles>
-+ <Configurations>
-+ <Configuration
-+ Name="Debug|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="4"
-+ CharacterSet="1"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="0"
-+ AdditionalIncludeDirectories=".;.\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;DEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN"
-+ MinimalRebuild="true"
-+ BasicRuntimeChecks="3"
-+ RuntimeLibrary="3"
-+ UsePrecompiledHeader="0"
-+ WarningLevel="3"
-+ DebugInformationFormat="4"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLibrarianTool"
-+ AdditionalDependencies="$(TargetDir)\util.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ <Configuration
-+ Name="Release|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="4"
-+ CharacterSet="1"
-+ WholeProgramOptimization="1"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="2"
-+ EnableIntrinsicFunctions="true"
-+ AdditionalIncludeDirectories=".;.\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;NDEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN"
-+ StringPooling="true"
-+ RuntimeLibrary="2"
-+ EnableFunctionLevelLinking="true"
-+ UsePrecompiledHeader="0"
-+ WarningLevel="3"
-+ DebugInformationFormat="3"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLibrarianTool"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ </Configurations>
-+ <References>
-+ </References>
-+ <Files>
-+ <Filter
-+ Name="Source Files"
-+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-+ >
-+ <File
-+ RelativePath=".\re2\bitstate.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\compile.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\dfa.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\filtered_re2.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\mimics_pcre.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\nfa.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\onepass.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\parse.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\perl_groups.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prefilter.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prefilter_tree.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prog.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\re2.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\regexp.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\rune.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\set.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\simplify.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\strutil.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\tostring.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\unicode_casefold.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\unicode_groups.cc"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Header Files"
-+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
-+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-+ >
-+ <File
-+ RelativePath=".\re2\filtered_re2.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\logging.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\mutex.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prefilter.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prefilter_tree.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\prog.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\random.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\re2.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\regexp.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\set.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\stdint.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\unicode_casefold.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\unicode_groups.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\utf.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util\util.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\variadic_function.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\re2\walker-inl.h"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Resource Files"
-+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-+ >
-+ </Filter>
-+ <File
-+ RelativePath=".\ClassDiagram1.cd"
-+ >
-+ </File>
-+ </Files>
-+ <Globals>
-+ </Globals>
-+</VisualStudioProject>
-diff -r c79416ca4228 re2/compile.cc
---- a/re2/compile.cc Tue May 29 11:50:48 2012 -0400
-+++ b/re2/compile.cc Wed Jun 20 19:00:08 2012 +0200
-@@ -501,7 +501,7 @@
+diff --git a/third_party/re2/re2/compile.cc b/third_party/re2/re2/compile.cc
+index 9cddb71..adb45fd 100644
+--- a/third_party/re2/re2/compile.cc
++++ b/third_party/re2/re2/compile.cc
+@@ -502,7 +502,7 @@ int Compiler::RuneByteSuffix(uint8 lo, uint8 hi, bool foldcase, int next) {
return UncachedRuneByteSuffix(lo, hi, foldcase, next);
}
@@ -655,9 +287,10 @@ diff -r c79416ca4228 re2/compile.cc
map<uint64, int>::iterator it = rune_cache_.find(key);
if (it != rune_cache_.end())
return it->second;
-diff -r c79416ca4228 re2/prefilter_tree.cc
---- a/re2/prefilter_tree.cc Tue May 29 11:50:48 2012 -0400
-+++ b/re2/prefilter_tree.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/re2/prefilter_tree.cc b/third_party/re2/re2/prefilter_tree.cc
+index d8bc37a..cdcf77e 100644
+--- a/third_party/re2/re2/prefilter_tree.cc
++++ b/third_party/re2/re2/prefilter_tree.cc
@@ -8,6 +8,11 @@
#include "re2/prefilter_tree.h"
#include "re2/re2.h"
@@ -670,9 +303,10 @@ diff -r c79416ca4228 re2/prefilter_tree.cc
DEFINE_int32(filtered_re2_min_atom_len,
3,
"Strings less than this length are not stored as atoms");
-diff -r c79416ca4228 re2/re2.cc
---- a/re2/re2.cc Tue May 29 11:50:48 2012 -0400
-+++ b/re2/re2.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
+index 3cc3dd4..989add6 100644
+--- a/third_party/re2/re2/re2.cc
++++ b/third_party/re2/re2/re2.cc
@@ -11,7 +11,13 @@
#include <stdio.h>
@@ -687,40 +321,73 @@ diff -r c79416ca4228 re2/re2.cc
#include <errno.h>
#include "util/util.h"
#include "util/flags.h"
-@@ -31,8 +37,6 @@
+@@ -31,10 +37,22 @@ const VariadicFunction2<bool, const StringPiece&, const RE2&, RE2::Arg, RE2::Par
const VariadicFunction2<bool, StringPiece*, const RE2&, RE2::Arg, RE2::ConsumeN> RE2::Consume;
const VariadicFunction2<bool, StringPiece*, const RE2&, RE2::Arg, RE2::FindAndConsumeN> RE2::FindAndConsume;
+-// This will trigger LNK2005 error in MSVC.
+-#ifndef COMPILER_MSVC
-const int RE2::Options::kDefaultMaxMem; // initialized in re2.h
--
- // Commonly-used option sets; arguments to constructor are:
- // utf8 input
- // posix syntax
-diff -r c79416ca4228 re2/re2.h
---- a/re2/re2.h Tue May 29 11:50:48 2012 -0400
-+++ b/re2/re2.h Wed Jun 20 19:00:08 2012 +0200
-@@ -5,6 +5,8 @@
- #ifndef RE2_RE2_H
- #define RE2_RE2_H
-
+-#endif // COMPILER_MSVC
+#define kDefaultMaxMem (8<<20)
+
- // C++ interface to the re2 regular-expression library.
- // RE2 supports Perl-style regular expressions (with extensions like
- // \d, \w, \s, ...).
-@@ -517,9 +519,6 @@
- // Once a DFA fills its budget, it flushes its cache and starts over.
++RE2::Options::Options()
++ : encoding_(EncodingUTF8),
++ posix_syntax_(false),
++ longest_match_(false),
++ log_errors_(true),
++ max_mem_(kDefaultMaxMem),
++ literal_(false),
++ never_nl_(false),
++ never_capture_(false),
++ case_sensitive_(true),
++ perl_classes_(false),
++ word_boundary_(false),
++ one_line_(false) {
++}
+
+ RE2::Options::Options(RE2::CannedOptions opt)
+ : encoding_(opt == RE2::Latin1 ? EncodingLatin1 : EncodingUTF8),
+diff --git a/third_party/re2/re2/re2.h b/third_party/re2/re2/re2.h
+index 9f5b66d..98b06b8 100644
+--- a/third_party/re2/re2/re2.h
++++ b/third_party/re2/re2/re2.h
+@@ -552,28 +552,16 @@ class RE2 {
// If this happens too often, RE2 falls back on the NFA implementation.
-- // For now, make the default budget something close to Code Search.
-- static const int kDefaultMaxMem = 8<<20;
--
+ // For now, make the default budget something close to Code Search.
++#ifndef WIN32
+ static const int kDefaultMaxMem = 8<<20;
++#endif
+
enum Encoding {
EncodingUTF8 = 1,
EncodingLatin1
-diff -r c79416ca4228 re2/stringpiece.h
---- a/re2/stringpiece.h Tue May 29 11:50:48 2012 -0400
-+++ b/re2/stringpiece.h Wed Jun 20 19:00:08 2012 +0200
+ };
+
+- Options() :
+- encoding_(EncodingUTF8),
+- posix_syntax_(false),
+- longest_match_(false),
+- log_errors_(true),
+- max_mem_(kDefaultMaxMem),
+- literal_(false),
+- never_nl_(false),
+- never_capture_(false),
+- case_sensitive_(true),
+- perl_classes_(false),
+- word_boundary_(false),
+- one_line_(false) {
+- }
+-
++ Options();
+ /*implicit*/ Options(CannedOptions);
+
+ Encoding encoding() const { return encoding_; }
+diff --git a/third_party/re2/re2/stringpiece.h b/third_party/re2/re2/stringpiece.h
+index ab9297c..38a5150 100644
+--- a/third_party/re2/re2/stringpiece.h
++++ b/third_party/re2/re2/stringpiece.h
@@ -23,6 +23,9 @@
#include <cstddef>
#include <iosfwd>
@@ -731,9 +398,10 @@ diff -r c79416ca4228 re2/stringpiece.h
namespace re2 {
-diff -r c79416ca4228 re2/testing/re2_test.cc
---- a/re2/testing/re2_test.cc Tue May 29 11:50:48 2012 -0400
-+++ b/re2/testing/re2_test.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/re2/testing/re2_test.cc b/third_party/re2/re2/testing/re2_test.cc
+index b99cacf..911e868 100644
+--- a/third_party/re2/re2/testing/re2_test.cc
++++ b/third_party/re2/re2/testing/re2_test.cc
@@ -6,7 +6,9 @@
// TODO: Test extractions for PartialMatch/Consume
@@ -756,7 +424,7 @@ diff -r c79416ca4228 re2/testing/re2_test.cc
DECLARE_bool(logtostderr);
namespace re2 {
-@@ -657,6 +664,7 @@
+@@ -657,6 +664,7 @@ TEST(RE2, FullMatchTypedNullArg) {
CHECK(!RE2::FullMatch("hello", "(.*)", (float*)NULL));
}
@@ -764,7 +432,7 @@ diff -r c79416ca4228 re2/testing/re2_test.cc
// Check that numeric parsing code does not read past the end of
// the number being parsed.
TEST(RE2, NULTerminated) {
-@@ -678,6 +686,7 @@
+@@ -678,6 +686,7 @@ TEST(RE2, NULTerminated) {
CHECK(RE2::FullMatch(StringPiece(v + pagesize - 1, 1), "(.*)", &x));
CHECK_EQ(x, 1);
}
@@ -772,311 +440,10 @@ diff -r c79416ca4228 re2/testing/re2_test.cc
TEST(RE2, FullMatchTypeTests) {
// Type tests
-diff -r c79416ca4228 re2_testing/re2_testing.vcproj
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/re2_testing/re2_testing.vcproj Wed Jun 20 19:00:08 2012 +0200
-@@ -0,0 +1,298 @@
-+<?xml version="1.0" encoding="Windows-1252"?>
-+<VisualStudioProject
-+ ProjectType="Visual C++"
-+ Version="9.00"
-+ Name="re2_testing"
-+ ProjectGUID="{1B9A5974-DA06-4F57-BFFC-4DE19B968AE8}"
-+ RootNamespace="re2_testing"
-+ TargetFrameworkVersion="196613"
-+ >
-+ <Platforms>
-+ <Platform
-+ Name="Win32"
-+ />
-+ </Platforms>
-+ <ToolFiles>
-+ </ToolFiles>
-+ <Configurations>
-+ <Configuration
-+ Name="Debug|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="1"
-+ CharacterSet="2"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="0"
-+ AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;..\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;DEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN;NOGDI"
-+ MinimalRebuild="true"
-+ BasicRuntimeChecks="3"
-+ RuntimeLibrary="3"
-+ WarningLevel="3"
-+ DebugInformationFormat="4"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+ AdditionalDependencies="$(TargetDir)/re2.lib"
-+ GenerateDebugInformation="true"
-+ TargetMachine="1"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCManifestTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCAppVerifierTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ <Configuration
-+ Name="Release|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="1"
-+ CharacterSet="2"
-+ WholeProgramOptimization="1"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="2"
-+ EnableIntrinsicFunctions="true"
-+ AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;..\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;DEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN;NOGDI"
-+ RuntimeLibrary="2"
-+ EnableFunctionLevelLinking="true"
-+ WarningLevel="3"
-+ DebugInformationFormat="3"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+ AdditionalDependencies="$(TargetDir)/re2.lib"
-+ GenerateDebugInformation="true"
-+ OptimizeReferences="2"
-+ EnableCOMDATFolding="2"
-+ TargetMachine="1"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCManifestTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCAppVerifierTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ </Configurations>
-+ <References>
-+ </References>
-+ <Files>
-+ <Filter
-+ Name="Source Files"
-+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-+ >
-+ <File
-+ RelativePath="..\re2\testing\backtrack.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\charclass_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\compile_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\dump.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\exhaustive_tester.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\filtered_re2_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\mimics_pcre_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\null_walker.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\parse_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\possible_match_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\util\random.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\re2_arg_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\re2_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\regexp_generator.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\regexp_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\required_prefix_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\search_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\set_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\simplify_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\string_generator.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\string_generator_test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\util\test.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\tester.cc"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Header Files"
-+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
-+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-+ >
-+ <File
-+ RelativePath="..\re2\testing\exhaustive_tester.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\regexp_generator.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\string_generator.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\util\test.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath="..\re2\testing\tester.h"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Resource Files"
-+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-+ >
-+ </Filter>
-+ </Files>
-+ <Globals>
-+ </Globals>
-+</VisualStudioProject>
-diff -r c79416ca4228 util/logging.h
---- a/util/logging.h Tue May 29 11:50:48 2012 -0400
-+++ b/util/logging.h Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/logging.h b/third_party/re2/util/logging.h
+index 734e7a1..7302ea6 100644
+--- a/third_party/re2/util/logging.h
++++ b/third_party/re2/util/logging.h
@@ -7,8 +7,13 @@
#ifndef RE2_UTIL_LOGGING_H__
#define RE2_UTIL_LOGGING_H__
@@ -1091,9 +458,10 @@ diff -r c79416ca4228 util/logging.h
// Debug-only checking.
#define DCHECK(condition) assert(condition)
-diff -r c79416ca4228 util/mutex.h
---- a/util/mutex.h Tue May 29 11:50:48 2012 -0400
-+++ b/util/mutex.h Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/mutex.h b/third_party/re2/util/mutex.h
+index 9787bfb..e321fae 100644
+--- a/third_party/re2/util/mutex.h
++++ b/third_party/re2/util/mutex.h
@@ -12,8 +12,10 @@
namespace re2 {
@@ -1105,7 +473,7 @@ diff -r c79416ca4228 util/mutex.h
#if defined(NO_THREADS)
typedef int MutexType; // to keep a lock-count
-@@ -32,7 +34,9 @@
+@@ -32,7 +34,9 @@ namespace re2 {
# include <pthread.h>
typedef pthread_mutex_t MutexType;
#elif defined(WIN32)
@@ -1116,9 +484,10 @@ diff -r c79416ca4228 util/mutex.h
# ifdef GMUTEX_TRYLOCK
// We need Windows NT or later for TryEnterCriticalSection(). If you
// don't need that functionality, you can remove these _WIN32_WINNT
-diff -r c79416ca4228 util/pcre.cc
---- a/util/pcre.cc Tue May 29 11:50:48 2012 -0400
-+++ b/util/pcre.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/pcre.cc b/third_party/re2/util/pcre.cc
+index 5e67e1f..1602133 100644
+--- a/third_party/re2/util/pcre.cc
++++ b/third_party/re2/util/pcre.cc
@@ -11,6 +11,11 @@
#include "util/flags.h"
#include "util/pcre.h"
@@ -1131,10 +500,11 @@ diff -r c79416ca4228 util/pcre.cc
#define PCREPORT(level) LOG(level)
// Default PCRE limits.
-diff -r c79416ca4228 util/pcre.h
---- a/util/pcre.h Tue May 29 11:50:48 2012 -0400
-+++ b/util/pcre.h Wed Jun 20 19:00:08 2012 +0200
-@@ -180,9 +180,15 @@
+diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h
+index 4dda95d..771ac91 100644
+--- a/third_party/re2/util/pcre.h
++++ b/third_party/re2/util/pcre.h
+@@ -180,9 +180,15 @@ struct pcre_extra { int flags, match_limit, match_limit_recursion; };
#define PCRE_ERROR_MATCHLIMIT 2
#define PCRE_ERROR_RECURSIONLIMIT 3
#define PCRE_INFO_CAPTURECOUNT 0
@@ -1150,9 +520,10 @@ diff -r c79416ca4228 util/pcre.h
} // namespace re2
#endif
-diff -r c79416ca4228 util/stringprintf.cc
---- a/util/stringprintf.cc Tue May 29 11:50:48 2012 -0400
-+++ b/util/stringprintf.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/stringprintf.cc b/third_party/re2/util/stringprintf.cc
+index c908181..d4691d1 100644
+--- a/third_party/re2/util/stringprintf.cc
++++ b/third_party/re2/util/stringprintf.cc
@@ -4,6 +4,10 @@
#include "util/util.h"
@@ -1164,9 +535,10 @@ diff -r c79416ca4228 util/stringprintf.cc
namespace re2 {
static void StringAppendV(string* dst, const char* format, va_list ap) {
-diff -r c79416ca4228 util/test.cc
---- a/util/test.cc Tue May 29 11:50:48 2012 -0400
-+++ b/util/test.cc Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/test.cc b/third_party/re2/util/test.cc
+index 0644829..2fe1bfa 100644
+--- a/third_party/re2/util/test.cc
++++ b/third_party/re2/util/test.cc
@@ -3,7 +3,9 @@
// license that can be found in the LICENSE file.
@@ -1177,7 +549,7 @@ diff -r c79416ca4228 util/test.cc
#include "util/test.h"
DEFINE_string(test_tmpdir, "/var/tmp", "temp directory");
-@@ -23,9 +25,13 @@
+@@ -23,9 +25,13 @@ void RegisterTest(void (*fn)(void), const char *name) {
namespace re2 {
int64 VirtualProcessSize() {
@@ -1191,9 +563,10 @@ diff -r c79416ca4228 util/test.cc
}
} // namespace re2
-diff -r c79416ca4228 util/util.h
---- a/util/util.h Tue May 29 11:50:48 2012 -0400
-+++ b/util/util.h Wed Jun 20 19:00:08 2012 +0200
+diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
+index 63a9c6f..dab7e16 100644
+--- a/third_party/re2/util/util.h
++++ b/third_party/re2/util/util.h
@@ -12,7 +12,9 @@
#include <stddef.h> // For size_t
#include <assert.h>
@@ -1204,7 +577,7 @@ diff -r c79416ca4228 util/util.h
#include <time.h>
// C++
-@@ -48,7 +50,11 @@
+@@ -50,7 +52,11 @@ using std::tr1::unordered_set;
#else
#include <unordered_set>
@@ -1216,276 +589,19 @@ diff -r c79416ca4228 util/util.h
#endif
-diff -r c79416ca4228 util/util.vcproj
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/util/util.vcproj Wed Jun 20 19:00:08 2012 +0200
-@@ -0,0 +1,253 @@
-+<?xml version="1.0" encoding="Windows-1252"?>
-+<VisualStudioProject
-+ ProjectType="Visual C++"
-+ Version="9.00"
-+ Name="util"
-+ ProjectGUID="{AB36233A-643A-4D2E-93B3-0602DA52C8D5}"
-+ RootNamespace="util"
-+ Keyword="Win32Proj"
-+ TargetFrameworkVersion="196613"
-+ >
-+ <Platforms>
-+ <Platform
-+ Name="Win32"
-+ />
-+ </Platforms>
-+ <ToolFiles>
-+ </ToolFiles>
-+ <Configurations>
-+ <Configuration
-+ Name="Debug|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="4"
-+ CharacterSet="1"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="0"
-+ AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;..\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;DEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN;NOGDI"
-+ MinimalRebuild="true"
-+ BasicRuntimeChecks="3"
-+ RuntimeLibrary="3"
-+ UsePrecompiledHeader="0"
-+ WarningLevel="3"
-+ DebugInformationFormat="4"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLibrarianTool"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ <Configuration
-+ Name="Release|Win32"
-+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+ IntermediateDirectory="$(ConfigurationName)"
-+ ConfigurationType="4"
-+ CharacterSet="1"
-+ WholeProgramOptimization="1"
-+ >
-+ <Tool
-+ Name="VCPreBuildEventTool"
-+ />
-+ <Tool
-+ Name="VCCustomBuildTool"
-+ />
-+ <Tool
-+ Name="VCXMLDataGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCWebServiceProxyGeneratorTool"
-+ />
-+ <Tool
-+ Name="VCMIDLTool"
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+ Optimization="2"
-+ EnableIntrinsicFunctions="true"
-+ AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;..\mswin"
-+ PreprocessorDefinitions="WIN32;NOMINMAX;DEBUG;_WINDOWS;_UNICODE;NOPCH;WIN32_LEAN_AND_MEAN;NOGDI"
-+ RuntimeLibrary="2"
-+ EnableFunctionLevelLinking="true"
-+ UsePrecompiledHeader="0"
-+ WarningLevel="3"
-+ DebugInformationFormat="3"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCResourceCompilerTool"
-+ />
-+ <Tool
-+ Name="VCPreLinkEventTool"
-+ />
-+ <Tool
-+ Name="VCLibrarianTool"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+ />
-+ <Tool
-+ Name="VCXDCMakeTool"
-+ />
-+ <Tool
-+ Name="VCBscMakeTool"
-+ />
-+ <Tool
-+ Name="VCFxCopTool"
-+ />
-+ <Tool
-+ Name="VCPostBuildEventTool"
-+ />
-+ </Configuration>
-+ </Configurations>
-+ <References>
-+ </References>
-+ <Files>
-+ <Filter
-+ Name="Source Files"
-+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-+ >
-+ <File
-+ RelativePath=".\arena.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\hash.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\pcre.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\random.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\rune.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\stringpiece.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\stringprintf.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\strutil.cc"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\valgrind.cc"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Header Files"
-+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
-+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-+ >
-+ <File
-+ RelativePath=".\arena.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\atomicops.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\benchmark.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\flags.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\logging.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\pcre.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\random.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\sparse_array.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\sparse_set.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\utf.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\util.h"
-+ >
-+ </File>
-+ <File
-+ RelativePath=".\valgrind.h"
-+ >
-+ </File>
-+ </Filter>
-+ <Filter
-+ Name="Resource Files"
-+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-+ >
-+ </Filter>
-+ </Files>
-+ <Globals>
-+ </Globals>
-+</VisualStudioProject>
-diff -r c79416ca4228 util/valgrind.h
---- a/util/valgrind.h Tue May 29 11:50:48 2012 -0400
-+++ b/util/valgrind.h Wed Jun 20 19:00:08 2012 +0200
-@@ -4063,7 +4063,7 @@
-
+diff --git a/third_party/re2/util/valgrind.h b/third_party/re2/util/valgrind.h
+index ca10b1a..d097b0c 100644
+--- a/third_party/re2/util/valgrind.h
++++ b/third_party/re2/util/valgrind.h
+@@ -4064,6 +4064,7 @@ typedef
#endif /* PLAT_ppc64_aix5 */
--
+
+#ifndef WIN32
/* ------------------------------------------------------------------ */
/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS. */
/* */
-@@ -4170,7 +4170,7 @@
+@@ -4170,7 +4171,7 @@ typedef
VG_USERREQ__DISCARD_TRANSLATIONS, \
_qzz_addr, _qzz_len, 0, 0, 0); \
}
diff --git a/third_party/re2/patches/remove-posix-option.patch b/third_party/re2/patches/remove-posix-option.patch
deleted file mode 100644
index ba55172..0000000
--- a/third_party/re2/patches/remove-posix-option.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r 2d252384c5e8 re2/re2.cc
---- a/re2/re2.cc Mon Mar 05 14:20:36 2012 -0500
-+++ b/re2/re2.cc Wed Jun 20 20:32:24 2012 +0200
-@@ -40,7 +40,7 @@
- // log errors
- const RE2::Options RE2::DefaultOptions; // EncodingUTF8, false, false, true
- const RE2::Options RE2::Latin1(RE2::Options::EncodingLatin1, false, false, true);
--const RE2::Options RE2::POSIX(RE2::Options::EncodingUTF8, true, true, true);
-+//const RE2::Options RE2::POSIX(RE2::Options::EncodingUTF8, true, true, true);
- const RE2::Options RE2::Quiet(RE2::Options::EncodingUTF8, false, false, false);
-
- // If a regular expression has no error, its error_ field points here
-diff -r 2d252384c5e8 re2/re2.h
---- a/re2/re2.h Mon Mar 05 14:20:36 2012 -0500
-+++ b/re2/re2.h Wed Jun 20 20:32:24 2012 +0200
-@@ -233,7 +233,7 @@
- // RE2 constructor.
- static const Options DefaultOptions;
- static const Options Latin1; // treat input as Latin-1 (default UTF-8)
-- static const Options POSIX; // POSIX syntax, leftmost-longest match
-+ //static const Options POSIX; // POSIX syntax, leftmost-longest match
- static const Options Quiet; // do not log about regexp parse errors
-
- // Need to have the const char* and const string& forms for implicit
diff --git a/third_party/re2/patches/remove-valgrind-code.patch b/third_party/re2/patches/remove-valgrind-code.patch
index 20fea48..1d8884a 100644
--- a/third_party/re2/patches/remove-valgrind-code.patch
+++ b/third_party/re2/patches/remove-valgrind-code.patch
@@ -1,6 +1,7 @@
-diff -r ceab86d470c1 re2/dfa.cc
---- a/re2/dfa.cc Tue Jul 03 16:43:11 2012 +0200
-+++ b/re2/dfa.cc Tue Jul 03 17:03:00 2012 +0200
+diff --git a/third_party/re2/re2/dfa.cc b/third_party/re2/re2/dfa.cc
+index 3a6a387..32c8c33 100644
+--- a/third_party/re2/re2/dfa.cc
++++ b/third_party/re2/re2/dfa.cc
@@ -27,6 +27,8 @@
#include "util/flags.h"
#include "util/sparse_set.h"
@@ -10,10 +11,11 @@ diff -r ceab86d470c1 re2/dfa.cc
DEFINE_bool(re2_dfa_bail_when_slow, true,
"Whether the RE2 DFA should bail out early "
"if the NFA would be faster (for testing).");
-diff -r ceab86d470c1 util/util.h
---- a/util/util.h Tue Jul 03 16:43:11 2012 +0200
-+++ b/util/util.h Tue Jul 03 17:03:00 2012 +0200
-@@ -28,6 +28,8 @@
+diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
+index a43ff76..63a9c6f 100644
+--- a/third_party/re2/util/util.h
++++ b/third_party/re2/util/util.h
+@@ -26,6 +26,8 @@
#include <utility>
#include <set>
@@ -22,7 +24,7 @@ diff -r ceab86d470c1 util/util.h
// Use std names.
using std::set;
using std::pair;
-@@ -86,16 +88,6 @@
+@@ -80,17 +82,6 @@ template<bool> struct CompileAssert {};
#define arraysize(array) (sizeof(array)/sizeof((array)[0]))
@@ -35,11 +37,12 @@ diff -r ceab86d470c1 util/util.h
-#define NO_THREAD_SAFETY_ANALYSIS
-#define ANNOTATE_HAPPENS_BEFORE(x)
-#define ANNOTATE_HAPPENS_AFTER(x)
+-#define ANNOTATE_UNPROTECTED_READ(x) (x)
-
class StringPiece;
string CEscape(const StringPiece& src);
-@@ -121,8 +113,6 @@
+@@ -116,8 +107,6 @@ static inline uint64 Hash64StringWithSeed(const char* s, int len, uint32 seed) {
return ((uint64)x << 32) | y;
}
generated by cgit v1.1 at 2025-02-19 15:01:51 +0000