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

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>
@@ skipping 28 matching lines @@
 using std::string;
 using std::min;
 using std::max;
 using std::ostream;
 using std::map;
 using std::stack;
 using std::sort;
 using std::swap;
 using std::make_pair;
 
-#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \
-    !defined(_LIBCPP_ABI_VERSION)
+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(_LIBCPP_ABI_VERSION) && !defined(OS_ANDROID)

[Nico, 2015/04/22 23:48:28]

ugh, rsc merged this bit too? That doesn't make sense outside of chromium builds
:-(

[tfarina, 2015/04/22 23:57:51]

Yep, it is all there. :/

https://code.googlesource.com/re2/+/master/util/util.h#47

 
 #include <tr1/unordered_set>
 using std::tr1::unordered_set;
 
 #else
 
 #include <unordered_set>
 #if defined(WIN32) || defined(OS_ANDROID)
 using std::tr1::unordered_set;
 #else
@@ skipping 81 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__