third_party/re2: Remove remove-static-initializers.patch.

third_party/re2/re2/prefilter_tree.cc

Index: third_party/re2/re2/prefilter_tree.cc
diff --git a/third_party/re2/re2/prefilter_tree.cc b/third_party/re2/re2/prefilter_tree.cc
index e5c465b0f152d21194b8ff1424a8b0762b9e2b6b..45d8d9947719c0283aaca4b51ee011389b7e7785 100644
--- a/third_party/re2/re2/prefilter_tree.cc
+++ b/third_party/re2/re2/prefilter_tree.cc
@@ -114,11 +114,9 @@ void PrefilterTree::Compile(vector<string>* atom_vec) {
       // this trigger. TODO(vsri): Adjust the threshold appropriately,
       // make it a function of total number of nodes?
       bool have_other_guard = true;
-      for (StdIntMap::iterator it = parents->begin();
-           it != parents->end(); ++it) {
+      for (StdIntMap::iterator it = parents->begin(); it != parents->end(); ++it)
         have_other_guard = have_other_guard &&
             (entries_[it->first].propagate_up_at_count > 1);
-      }
 
       if (have_other_guard) {
         for (StdIntMap::iterator it = parents->begin();
@@ -251,7 +249,7 @@ void PrefilterTree::AssignUniqueIds(vector<string>* atom_vec) {
 
       case Prefilter::OR:
       case Prefilter::AND: {
-        std::set<int> uniq_child;
+        set<int> uniq_child;
         for (int j = 0; j < prefilter->subs()->size() ; j++) {
           Prefilter* child = (*prefilter->subs())[j];
           Prefilter* canonical = CanonicalNode(child);
@@ -263,8 +261,7 @@ void PrefilterTree::AssignUniqueIds(vector<string>* atom_vec) {
           uniq_child.insert(child_id);
           // To the child, we want to add to parent indices.
           Entry* child_entry = &entries_[child_id];
-          if (child_entry->parents->find(prefilter->unique_id()) ==
-              child_entry->parents->end())
+          if (child_entry->parents->find(prefilter->unique_id()) == child_entry->parents->end())
             (*child_entry->parents)[prefilter->unique_id()] = 1;
         }
         entry->propagate_up_at_count =