Updated to most recent version RE2 and remove upstreamed patches.

third_party/re2/util/util.h

 // Copyright 2009 The RE2 Authors.  All Rights Reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #ifndef RE2_UTIL_UTIL_H__
 #define RE2_UTIL_UTIL_H__
 
 // C
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <stddef.h>         // For size_t
 #include <assert.h>
 #include <stdarg.h>
 #ifndef WIN32
 #include <sys/time.h>
 #endif
 #include <time.h>
+#include <ctype.h>      // For isdigit, isalpha.
 
 // C++
 #include <vector>
 #include <string>
 #include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <stack>
 #include <ostream>
 #include <utility>
@@ skipping 53 matching lines @@
   typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
 
 // DISALLOW_EVIL_CONSTRUCTORS disallows the copy and operator= functions.
 // It goes in the private: declarations in a class.
 #define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \
   TypeName(const TypeName&);                 \
   void operator=(const TypeName&)
 
 #define arraysize(array) (sizeof(array)/sizeof((array)[0]))
 
+// Fake lock annotations.  For real ones, see
+// http://code.google.com/p/data-race-test/
+#ifndef ANNOTATE_PUBLISH_MEMORY_RANGE
+#define ANNOTATE_PUBLISH_MEMORY_RANGE(a, b)
+#define ANNOTATE_IGNORE_WRITES_BEGIN()
+#define ANNOTATE_IGNORE_WRITES_END()
+#define ANNOTATE_BENIGN_RACE(a, b)
+#define NO_THREAD_SAFETY_ANALYSIS
+#define ANNOTATE_HAPPENS_BEFORE(x)
+#define ANNOTATE_HAPPENS_AFTER(x)
+#define ANNOTATE_UNPROTECTED_READ(x) (x)
+#endif
+
 class StringPiece;
 
 string CEscape(const StringPiece& src);
 int CEscapeString(const char* src, int src_len, char* dest, int dest_len);
 
 extern string StringPrintf(const char* format, ...);
 extern void SStringPrintf(string* dst, const char* format, ...);
 extern void StringAppendF(string* dst, const char* format, ...);
 extern string PrefixSuccessor(const StringPiece& prefix);
 
@@ skipping 13 matching lines @@
 }
 
 }  // namespace re2
 
 #include "util/arena.h"
 #include "util/logging.h"
 #include "util/mutex.h"
 #include "util/utf.h"
 
 #endif // RE2_UTIL_UTIL_H__