Revert of Update re2

third_party/re2/re2/regexp.h

Index: third_party/re2/re2/regexp.h
diff --git a/third_party/re2/re2/regexp.h b/third_party/re2/re2/regexp.h
index 5f222b7c9f7c876088cefa5b372f3b00ff3ef306..331c017673c42574fcfff9f73ef181fe3ff0cadf 100644
--- a/third_party/re2/re2/regexp.h
+++ b/third_party/re2/re2/regexp.h
@@ -208,11 +208,10 @@
   StringPiece error_arg_;       // Piece of regexp containing syntax error.
   string* tmp_;                 // Temporary storage, possibly where error_arg_ is.
 
-  DISALLOW_COPY_AND_ASSIGN(RegexpStatus);
-};
-
-// Walkers to implement Simplify.
-class CoalesceWalker;
+  DISALLOW_EVIL_CONSTRUCTORS(RegexpStatus);
+};
+
+// Walker to implement Simplify.
 class SimplifyWalker;
 
 // Compiled form; see prog.h
@@ -262,7 +261,7 @@
   int nrunes_;
   RuneRange *ranges_;
   int nranges_;
-  DISALLOW_COPY_AND_ASSIGN(CharClass);
+  DISALLOW_EVIL_CONSTRUCTORS(CharClass);
 };
 
 class Regexp {
@@ -313,7 +312,7 @@
   // Get.  No set, Regexps are logically immutable once created.
   RegexpOp op() { return static_cast<RegexpOp>(op_); }
   int nsub() { return nsub_; }
-  bool simple() { return simple_ != 0; }
+  bool simple() { return simple_; }
   enum ParseFlags parse_flags() { return static_cast<ParseFlags>(parse_flags_); }
   int Ref();  // For testing.
 
@@ -354,7 +353,6 @@
   // removed.  The result will capture exactly the same
   // subexpressions the original did, unless formatted with ToString.
   Regexp* Simplify();
-  friend class CoalesceWalker;
   friend class SimplifyWalker;
 
   // Parses the regexp src and then simplifies it and sets *dst to the
@@ -570,7 +568,7 @@
     void *the_union_[2];  // as big as any other element, for memset
   };
 
-  DISALLOW_COPY_AND_ASSIGN(Regexp);
+  DISALLOW_EVIL_CONSTRUCTORS(Regexp);
 };
 
 // Character class set: contains non-overlapping, non-abutting RuneRanges.
@@ -604,7 +602,7 @@
   uint32 lower_;  // bitmap of a-z
   int nrunes_;
   RuneRangeSet ranges_;
-  DISALLOW_COPY_AND_ASSIGN(CharClassBuilder);
+  DISALLOW_EVIL_CONSTRUCTORS(CharClassBuilder);
 };
 
 // Tell g++ that bitwise ops on ParseFlags produce ParseFlags.