Update re2

third_party/re2/re2/prefilter_tree.h

Index: third_party/re2/re2/prefilter_tree.h
diff --git a/third_party/re2/re2/prefilter_tree.h b/third_party/re2/re2/prefilter_tree.h
index 94eb183cbcf33bd2456f8b605009d70b7b25f33c..abea55d588db0cfd471d810f0a233902ad65f273 100644
--- a/third_party/re2/re2/prefilter_tree.h
+++ b/third_party/re2/re2/prefilter_tree.h
@@ -16,15 +16,13 @@
 #ifndef RE2_PREFILTER_TREE_H_
 #define RE2_PREFILTER_TREE_H_
 
-#include <map>
-
 #include "util/util.h"
 #include "util/sparse_array.h"
 
 namespace re2 {
 
 typedef SparseArray<int> IntMap;
-typedef std::map<int, int> StdIntMap;
+typedef map<int, int> StdIntMap;
 
 class Prefilter;
 
@@ -125,7 +123,7 @@ class PrefilterTree {
   // Has the prefilter tree been compiled.
   bool compiled_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PrefilterTree);
+  DISALLOW_COPY_AND_ASSIGN(PrefilterTree);
 };
 
 }  // namespace