Remove the last #include directives from util/util.h.
Change-Id: I3e1a7f3644cec27adcfbd6f806851ec0d9223b38
Reviewed-on: https://code-review.googlesource.com/6835
Reviewed-by: Paul Wankadia <[email protected]>
diff --git a/re2/bitmap256.h b/re2/bitmap256.h
index 5334586..1abae99 100644
--- a/re2/bitmap256.h
+++ b/re2/bitmap256.h
@@ -12,6 +12,7 @@
#include <string.h>
#include "util/util.h"
+#include "util/logging.h"
namespace re2 {
diff --git a/re2/bitstate.cc b/re2/bitstate.cc
index c4b698a..f8969f4 100644
--- a/re2/bitstate.cc
+++ b/re2/bitstate.cc
@@ -21,6 +21,7 @@
#include <stdint.h>
#include <string.h>
+#include "util/logging.h"
#include "re2/prog.h"
#include "re2/regexp.h"
diff --git a/re2/compile.cc b/re2/compile.cc
index ed4bfb8..0ceda88 100644
--- a/re2/compile.cc
+++ b/re2/compile.cc
@@ -14,6 +14,8 @@
#include <map>
#include <utility>
+#include "util/logging.h"
+#include "util/utf.h"
#include "re2/prog.h"
#include "re2/re2.h"
#include "re2/regexp.h"
diff --git a/re2/dfa.cc b/re2/dfa.cc
index 66fc8b9..3ce4b8a 100644
--- a/re2/dfa.cc
+++ b/re2/dfa.cc
@@ -36,7 +36,9 @@
#include <vector>
#include "util/flags.h"
+#include "util/logging.h"
#include "util/mix.h"
+#include "util/mutex.h"
#include "util/sparse_set.h"
#include "util/strutil.h"
#include "re2/prog.h"
diff --git a/re2/filtered_re2.cc b/re2/filtered_re2.cc
index 6bc4b46..8caf992 100644
--- a/re2/filtered_re2.cc
+++ b/re2/filtered_re2.cc
@@ -8,6 +8,7 @@
#include <string>
#include "util/util.h"
+#include "util/logging.h"
#include "re2/prefilter.h"
#include "re2/prefilter_tree.h"
diff --git a/re2/mimics_pcre.cc b/re2/mimics_pcre.cc
index 8a57447..ad197be 100644
--- a/re2/mimics_pcre.cc
+++ b/re2/mimics_pcre.cc
@@ -23,6 +23,7 @@
// Regexp::MimicsPCRE checks for any of these conditions.
#include "util/util.h"
+#include "util/logging.h"
#include "re2/regexp.h"
#include "re2/walker-inl.h"
diff --git a/re2/nfa.cc b/re2/nfa.cc
index 9d80f9c..0af8c25 100644
--- a/re2/nfa.cc
+++ b/re2/nfa.cc
@@ -33,6 +33,7 @@
#include "re2/prog.h"
#include "re2/regexp.h"
+#include "util/logging.h"
#include "util/sparse_array.h"
#include "util/sparse_set.h"
#include "util/strutil.h"
diff --git a/re2/onepass.cc b/re2/onepass.cc
index 1e88cff..94efbf3 100644
--- a/re2/onepass.cc
+++ b/re2/onepass.cc
@@ -58,8 +58,10 @@
#include <vector>
#include "util/util.h"
+#include "util/logging.h"
#include "util/sparse_set.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/prog.h"
#include "re2/stringpiece.h"
diff --git a/re2/parse.cc b/re2/parse.cc
index 2fa7fd8..0905448 100644
--- a/re2/parse.cc
+++ b/re2/parse.cc
@@ -25,7 +25,9 @@
#include <string>
#include "util/util.h"
+#include "util/logging.h"
#include "util/strutil.h"
+#include "util/utf.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 661096e..eaf4a27 100644
--- a/re2/prefilter.cc
+++ b/re2/prefilter.cc
@@ -10,7 +10,9 @@
#include <vector>
#include "util/util.h"
+#include "util/logging.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/re2.h"
#include "re2/unicode_casefold.h"
#include "re2/walker-inl.h"
diff --git a/re2/prefilter.h b/re2/prefilter.h
index 1d36dcb..f400e4f 100644
--- a/re2/prefilter.h
+++ b/re2/prefilter.h
@@ -14,6 +14,7 @@
#include <vector>
#include "util/util.h"
+#include "util/logging.h"
namespace re2 {
diff --git a/re2/prefilter_tree.cc b/re2/prefilter_tree.cc
index ec4e755..bbfb2d7 100644
--- a/re2/prefilter_tree.cc
+++ b/re2/prefilter_tree.cc
@@ -16,6 +16,7 @@
#include "util/util.h"
#include "util/flags.h"
+#include "util/logging.h"
#include "re2/prefilter.h"
#include "re2/re2.h"
diff --git a/re2/prog.cc b/re2/prog.cc
index b2869cc..bd83422 100644
--- a/re2/prog.cc
+++ b/re2/prog.cc
@@ -14,6 +14,7 @@
#include <utility>
#include "util/util.h"
+#include "util/logging.h"
#include "util/strutil.h"
#include "re2/bitmap256.h"
#include "re2/stringpiece.h"
diff --git a/re2/prog.h b/re2/prog.h
index ccbf36a..339ef20 100644
--- a/re2/prog.h
+++ b/re2/prog.h
@@ -16,6 +16,8 @@
#include <vector>
#include "util/util.h"
+#include "util/logging.h"
+#include "util/mutex.h"
#include "util/sparse_array.h"
#include "util/sparse_set.h"
#include "re2/re2.h"
diff --git a/re2/re2.cc b/re2/re2.cc
index 5ea7c73..62f13f2 100644
--- a/re2/re2.cc
+++ b/re2/re2.cc
@@ -23,8 +23,10 @@
#include "util/util.h"
#include "util/flags.h"
+#include "util/logging.h"
#include "util/sparse_array.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/prog.h"
#include "re2/regexp.h"
diff --git a/re2/regexp.cc b/re2/regexp.cc
index 183b243..950c985 100644
--- a/re2/regexp.cc
+++ b/re2/regexp.cc
@@ -17,6 +17,9 @@
#include <vector>
#include "util/util.h"
+#include "util/logging.h"
+#include "util/mutex.h"
+#include "util/utf.h"
#include "re2/stringpiece.h"
#include "re2/walker-inl.h"
diff --git a/re2/regexp.h b/re2/regexp.h
index ebbabf1..c11c2c1 100644
--- a/re2/regexp.h
+++ b/re2/regexp.h
@@ -92,6 +92,8 @@
#include <string>
#include "util/util.h"
+#include "util/logging.h"
+#include "util/utf.h"
#include "re2/stringpiece.h"
namespace re2 {
diff --git a/re2/set.cc b/re2/set.cc
index 6284959..db2d13d 100644
--- a/re2/set.cc
+++ b/re2/set.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include "util/util.h"
+#include "util/logging.h"
#include "re2/stringpiece.h"
#include "re2/prog.h"
#include "re2/re2.h"
diff --git a/re2/simplify.cc b/re2/simplify.cc
index 4de54b9..06f0386 100644
--- a/re2/simplify.cc
+++ b/re2/simplify.cc
@@ -9,6 +9,8 @@
#include <string>
#include "util/util.h"
+#include "util/logging.h"
+#include "util/utf.h"
#include "re2/regexp.h"
#include "re2/walker-inl.h"
diff --git a/re2/stringpiece.cc b/re2/stringpiece.cc
index 57e4999..eb8a69a 100644
--- a/re2/stringpiece.cc
+++ b/re2/stringpiece.cc
@@ -3,6 +3,9 @@
// license that can be found in the LICENSE file.
#include "re2/stringpiece.h"
+
+#include <ostream>
+
#include "util/util.h"
using re2::StringPiece;
diff --git a/re2/testing/backtrack.cc b/re2/testing/backtrack.cc
index 30d2ec4..3b3e294 100644
--- a/re2/testing/backtrack.cc
+++ b/re2/testing/backtrack.cc
@@ -28,6 +28,7 @@
#include <string.h>
#include "util/util.h"
+#include "util/logging.h"
#include "re2/prog.h"
#include "re2/regexp.h"
diff --git a/re2/testing/charclass_test.cc b/re2/testing/charclass_test.cc
index e3b4434..7e0169c 100644
--- a/re2/testing/charclass_test.cc
+++ b/re2/testing/charclass_test.cc
@@ -7,6 +7,7 @@
#include <stdio.h>
#include "util/test.h"
+#include "util/utf.h"
#include "re2/regexp.h"
namespace re2 {
diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
index d62c55b..eb723bc 100644
--- a/re2/testing/compile_test.cc
+++ b/re2/testing/compile_test.cc
@@ -7,6 +7,7 @@
#include <string>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
#include "re2/prog.h"
diff --git a/re2/testing/dfa_test.cc b/re2/testing/dfa_test.cc
index 320d4e9..2051683 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/logging.h"
#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
diff --git a/re2/testing/dump.cc b/re2/testing/dump.cc
index 2326063..b60bf24 100644
--- a/re2/testing/dump.cc
+++ b/re2/testing/dump.cc
@@ -19,7 +19,9 @@
#include <string>
#include "util/test.h"
+#include "util/logging.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/stringpiece.h"
#include "re2/regexp.h"
diff --git a/re2/testing/exhaustive3_test.cc b/re2/testing/exhaustive3_test.cc
index 8e5b836..cf09e18 100644
--- a/re2/testing/exhaustive3_test.cc
+++ b/re2/testing/exhaustive3_test.cc
@@ -10,6 +10,7 @@
#include <vector>
#include "util/test.h"
+#include "util/utf.h"
#include "re2/testing/exhaustive_tester.h"
namespace re2 {
diff --git a/re2/testing/exhaustive_tester.cc b/re2/testing/exhaustive_tester.cc
index d5f7f12..e9ac4da 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/logging.h"
#include "util/strutil.h"
#include "re2/testing/exhaustive_tester.h"
#include "re2/testing/tester.h"
diff --git a/re2/testing/filtered_re2_test.cc b/re2/testing/filtered_re2_test.cc
index 4e09456..c3b2a3c 100644
--- a/re2/testing/filtered_re2_test.cc
+++ b/re2/testing/filtered_re2_test.cc
@@ -9,6 +9,7 @@
#include <vector>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/filtered_re2.h"
#include "re2/re2.h"
diff --git a/re2/testing/mimics_pcre_test.cc b/re2/testing/mimics_pcre_test.cc
index f965092..541e7d2 100644
--- a/re2/testing/mimics_pcre_test.cc
+++ b/re2/testing/mimics_pcre_test.cc
@@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.
#include "util/test.h"
+#include "util/logging.h"
#include "re2/prog.h"
#include "re2/regexp.h"
diff --git a/re2/testing/null_walker.cc b/re2/testing/null_walker.cc
index 6626a6d..77fa723 100644
--- a/re2/testing/null_walker.cc
+++ b/re2/testing/null_walker.cc
@@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
#include "re2/walker-inl.h"
diff --git a/re2/testing/parse_test.cc b/re2/testing/parse_test.cc
index eea0f15..95cb0e6 100644
--- a/re2/testing/parse_test.cc
+++ b/re2/testing/parse_test.cc
@@ -7,6 +7,7 @@
#include <string>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
namespace re2 {
diff --git a/re2/testing/possible_match_test.cc b/re2/testing/possible_match_test.cc
index e9e387b..ca8f5e1 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/logging.h"
#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
diff --git a/re2/testing/re2_test.cc b/re2/testing/re2_test.cc
index 9ebb609..5b92603 100644
--- a/re2/testing/re2_test.cc
+++ b/re2/testing/re2_test.cc
@@ -20,6 +20,7 @@
#endif
#include "util/test.h"
+#include "util/logging.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 749e5c3..b40afc0 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/logging.h"
#include "util/strutil.h"
#include "re2/prog.h"
#include "re2/re2.h"
diff --git a/re2/testing/regexp_generator.cc b/re2/testing/regexp_generator.cc
index e7f8ef6..c2f3400 100644
--- a/re2/testing/regexp_generator.cc
+++ b/re2/testing/regexp_generator.cc
@@ -30,7 +30,9 @@
#include <vector>
#include "util/test.h"
+#include "util/logging.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/testing/regexp_generator.h"
namespace re2 {
diff --git a/re2/testing/regexp_test.cc b/re2/testing/regexp_test.cc
index 92f907f..e612eae 100644
--- a/re2/testing/regexp_test.cc
+++ b/re2/testing/regexp_test.cc
@@ -10,6 +10,7 @@
#include <vector>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
namespace re2 {
diff --git a/re2/testing/required_prefix_test.cc b/re2/testing/required_prefix_test.cc
index 2368fe4..d535e87 100644
--- a/re2/testing/required_prefix_test.cc
+++ b/re2/testing/required_prefix_test.cc
@@ -5,6 +5,7 @@
#include <string>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
namespace re2 {
diff --git a/re2/testing/set_test.cc b/re2/testing/set_test.cc
index e84a5c6..b6a24de 100644
--- a/re2/testing/set_test.cc
+++ b/re2/testing/set_test.cc
@@ -6,6 +6,7 @@
#include <vector>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/re2.h"
#include "re2/set.h"
diff --git a/re2/testing/simplify_test.cc b/re2/testing/simplify_test.cc
index a8fd134..33f8a8c 100644
--- a/re2/testing/simplify_test.cc
+++ b/re2/testing/simplify_test.cc
@@ -8,6 +8,7 @@
#include <string>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/regexp.h"
namespace re2 {
diff --git a/re2/testing/string_generator.cc b/re2/testing/string_generator.cc
index 2f61b46..b789950 100644
--- a/re2/testing/string_generator.cc
+++ b/re2/testing/string_generator.cc
@@ -12,6 +12,7 @@
#include <vector>
#include "util/test.h"
+#include "util/logging.h"
#include "re2/testing/string_generator.h"
namespace re2 {
diff --git a/re2/testing/string_generator_test.cc b/re2/testing/string_generator_test.cc
index f7fd16a..cc4a934 100644
--- a/re2/testing/string_generator_test.cc
+++ b/re2/testing/string_generator_test.cc
@@ -8,6 +8,7 @@
#include <string>
#include "util/test.h"
+#include "util/utf.h"
#include "re2/testing/string_generator.h"
#include "re2/testing/regexp_generator.h"
diff --git a/re2/testing/tester.cc b/re2/testing/tester.cc
index 9552a5f..43ba2c9 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/logging.h"
#include "util/strutil.h"
#include "re2/testing/tester.h"
#include "re2/prog.h"
diff --git a/re2/tostring.cc b/re2/tostring.cc
index 9b9a77f..fc9faca 100644
--- a/re2/tostring.cc
+++ b/re2/tostring.cc
@@ -9,7 +9,9 @@
#include <string>
#include "util/util.h"
+#include "util/logging.h"
#include "util/strutil.h"
+#include "util/utf.h"
#include "re2/regexp.h"
#include "re2/walker-inl.h"
diff --git a/re2/unicode_casefold.h b/re2/unicode_casefold.h
index e254eba..8bdbb42 100644
--- a/re2/unicode_casefold.h
+++ b/re2/unicode_casefold.h
@@ -42,6 +42,7 @@
#include <stdint.h>
#include "util/util.h"
+#include "util/utf.h"
namespace re2 {
diff --git a/re2/unicode_groups.h b/re2/unicode_groups.h
index 8e01a01..75f55da 100644
--- a/re2/unicode_groups.h
+++ b/re2/unicode_groups.h
@@ -21,6 +21,7 @@
#include <stdint.h>
#include "util/util.h"
+#include "util/utf.h"
namespace re2 {
diff --git a/re2/walker-inl.h b/re2/walker-inl.h
index d87b41f..032b8ac 100644
--- a/re2/walker-inl.h
+++ b/re2/walker-inl.h
@@ -15,6 +15,7 @@
#include <stack>
+#include "util/logging.h"
#include "re2/regexp.h"
namespace re2 {
