Tidy up the string utilities.
Change-Id: Ifd19a737b4a6a3e333aac64909a4694f7169786e
Reviewed-on: https://code-review.googlesource.com/6832
Reviewed-by: Paul Wankadia <[email protected]>
diff --git a/re2/dfa.cc b/re2/dfa.cc
index b9e5ef2..65fe1dd 100644
--- a/re2/dfa.cc
+++ b/re2/dfa.cc
@@ -38,6 +38,7 @@
#include "util/flags.h"
#include "util/mix.h"
#include "util/sparse_set.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/stringpiece.h"
diff --git a/re2/nfa.cc b/re2/nfa.cc
index 1a7f927..ee7206c 100644
--- a/re2/nfa.cc
+++ b/re2/nfa.cc
@@ -35,6 +35,7 @@
#include "re2/regexp.h"
#include "util/sparse_array.h"
#include "util/sparse_set.h"
+#include "util/strutil.h"
namespace re2 {
diff --git a/re2/onepass.cc b/re2/onepass.cc
index 12b660d..1e88cff 100644
--- a/re2/onepass.cc
+++ b/re2/onepass.cc
@@ -59,6 +59,7 @@
#include "util/util.h"
#include "util/sparse_set.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/stringpiece.h"
diff --git a/re2/parse.cc b/re2/parse.cc
index 5fcfa83..3740ade 100644
--- a/re2/parse.cc
+++ b/re2/parse.cc
@@ -25,6 +25,7 @@
#include <string>
#include "util/util.h"
+#include "util/strutil.h"
#include "re2/regexp.h"
#include "re2/stringpiece.h"
#include "re2/unicode_casefold.h"
diff --git a/re2/prefilter.cc b/re2/prefilter.cc
index 19c2c50..e12c667 100644
--- a/re2/prefilter.cc
+++ b/re2/prefilter.cc
@@ -10,6 +10,7 @@
#include <vector>
#include "util/util.h"
+#include "util/strutil.h"
#include "re2/re2.h"
#include "re2/unicode_casefold.h"
#include "re2/walker-inl.h"
diff --git a/re2/prog.cc b/re2/prog.cc
index ad0a5e8..74b3175 100644
--- a/re2/prog.cc
+++ b/re2/prog.cc
@@ -14,6 +14,7 @@
#include <utility>
#include "util/util.h"
+#include "util/strutil.h"
#include "re2/bitmap256.h"
#include "re2/stringpiece.h"
diff --git a/re2/re2.cc b/re2/re2.cc
index b9e26df..5ea7c73 100644
--- a/re2/re2.cc
+++ b/re2/re2.cc
@@ -24,6 +24,7 @@
#include "util/util.h"
#include "util/flags.h"
#include "util/sparse_array.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/regexp.h"
diff --git a/re2/testing/dfa_test.cc b/re2/testing/dfa_test.cc
index 7b57577..320d4e9 100644
--- a/re2/testing/dfa_test.cc
+++ b/re2/testing/dfa_test.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
#include "re2/regexp.h"
diff --git a/re2/testing/dump.cc b/re2/testing/dump.cc
index fbd1871..2326063 100644
--- a/re2/testing/dump.cc
+++ b/re2/testing/dump.cc
@@ -19,6 +19,7 @@
#include <string>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/stringpiece.h"
#include "re2/regexp.h"
diff --git a/re2/testing/exhaustive_tester.cc b/re2/testing/exhaustive_tester.cc
index 262b57b..d5f7f12 100644
--- a/re2/testing/exhaustive_tester.cc
+++ b/re2/testing/exhaustive_tester.cc
@@ -14,6 +14,7 @@
#include <stdio.h>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/testing/exhaustive_tester.h"
#include "re2/testing/tester.h"
diff --git a/re2/testing/possible_match_test.cc b/re2/testing/possible_match_test.cc
index e757219..2bfee5a 100644
--- a/re2/testing/possible_match_test.cc
+++ b/re2/testing/possible_match_test.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
#include "re2/regexp.h"
diff --git a/re2/testing/re2_test.cc b/re2/testing/re2_test.cc
index b0f6537..9ebb609 100644
--- a/re2/testing/re2_test.cc
+++ b/re2/testing/re2_test.cc
@@ -20,6 +20,7 @@
#endif
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/re2.h"
#include "re2/regexp.h"
diff --git a/re2/testing/regexp_benchmark.cc b/re2/testing/regexp_benchmark.cc
index bbf4a58..749e5c3 100644
--- a/re2/testing/regexp_benchmark.cc
+++ b/re2/testing/regexp_benchmark.cc
@@ -11,6 +11,7 @@
#include <utility>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
#include "re2/regexp.h"
diff --git a/re2/testing/regexp_generator.cc b/re2/testing/regexp_generator.cc
index 6d214ea..e7f8ef6 100644
--- a/re2/testing/regexp_generator.cc
+++ b/re2/testing/regexp_generator.cc
@@ -30,6 +30,7 @@
#include <vector>
#include "util/test.h"
+#include "util/strutil.h"
#include "re2/testing/regexp_generator.h"
namespace re2 {
diff --git a/re2/testing/tester.cc b/re2/testing/tester.cc
index 50a84a9..9552a5f 100644
--- a/re2/testing/tester.cc
+++ b/re2/testing/tester.cc
@@ -12,6 +12,7 @@
#include "util/util.h"
#include "util/flags.h"
+#include "util/strutil.h"
#include "re2/testing/tester.h"
#include "re2/prog.h"
#include "re2/re2.h"
diff --git a/re2/tostring.cc b/re2/tostring.cc
index b967198..8d2fd78 100644
--- a/re2/tostring.cc
+++ b/re2/tostring.cc
@@ -9,6 +9,7 @@
#include <string>
#include "util/util.h"
+#include "util/strutil.h"
#include "re2/regexp.h"
#include "re2/walker-inl.h"
